Fix merge problems

[karo-tx-uboot.git] / common / main.c

diff --git a/common/main.c b/common/main.c
index a17b60b3aa92cecc9b4bbcaf78c83a84af8d7a8f..187ef8a3a5a6be1cdf600931fbf1c3c7f12d9ac0 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -116,7 +116,7 @@ static __inline__ int abortboot(int bootdelay)
        u_int i;
 
 #  ifdef CONFIG_AUTOBOOT_PROMPT
-       printf(CONFIG_AUTOBOOT_PROMPT, bootdelay);
+       printf(CONFIG_AUTOBOOT_PROMPT);
 #  endif
 
 #  ifdef CONFIG_AUTOBOOT_DELAY_STR
@@ -212,7 +212,7 @@ static __inline__ int abortboot(int bootdelay)
        int abort = 0;
 
 #ifdef CONFIG_MENUPROMPT
-       printf(CONFIG_MENUPROMPT, bootdelay);
+       printf(CONFIG_MENUPROMPT);
 #else
        printf("Hit any key to stop autoboot: %2d ", bootdelay);
 #endif
@@ -509,7 +509,7 @@ void reset_cmd_timeout(void)
  */
 
 #define putnstr(str,n) do {                    \
-               printf ("%.*s", n, str);        \
+               printf ("%.*s", (int)n, str);   \
        } while (0)
 
 #define CTL_CH(c)              ((c) - 'a' + 1)
@@ -940,12 +940,6 @@ int readline_into_buffer (const char *const prompt, char * buffer)
        int rc;
        static int initted = 0;
 
-       if (!initted) {
-               hist_init();
-               initted = 1;
-       }
-
-
        /*
         * History uses a global array which is not
         * writable until after relocation to RAM.