ARM: Migrate errata to Kconfig

[platform/kernel/u-boot.git] / common / autoboot.c

diff --git a/common/autoboot.c b/common/autoboot.c
index eb31c88..c52bad8 100644 (file)
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -187,9 +187,6 @@ static int __abortboot(int bootdelay)
        int abort;
        uint64_t etime = endtick(bootdelay);
 
-       if (bootdelay < 0)
-               return 0;
-
 #  ifdef CONFIG_AUTOBOOT_PROMPT
        /*
         * CONFIG_AUTOBOOT_PROMPT includes the %d for all boards.
@@ -202,11 +199,6 @@ static int __abortboot(int bootdelay)
        if (!abort)
                debug_bootkeys("key timeout\n");
 
-#ifdef CONFIG_SILENT_CONSOLE
-       if (abort)
-               gd->flags &= ~GD_FLG_SILENT;
-#endif
-
        return abort;
 }
 
@@ -224,20 +216,16 @@ static int __abortboot(int bootdelay)
 #ifdef CONFIG_MENUPROMPT
        printf(CONFIG_MENUPROMPT);
 #else
-       if (bootdelay >= 0)
-               printf("Hit any key to stop autoboot: %2d ", bootdelay);
+       printf("Hit any key to stop autoboot: %2d ", bootdelay);
 #endif
 
        /*
         * Check if key already pressed
-        * Don't check if bootdelay < 0
         */
-       if (bootdelay >= 0) {
-               if (tstc()) {   /* we got a key press   */
-                       (void) getc();  /* consume input        */
-                       puts("\b\b\b 0");
-                       abort = 1;      /* don't auto boot      */
-               }
+       if (tstc()) {   /* we got a key press   */
+               (void) getc();  /* consume input        */
+               puts("\b\b\b 0");
+               abort = 1;      /* don't auto boot      */
        }
 
        while ((bootdelay > 0) && (!abort)) {
@@ -263,18 +251,23 @@ static int __abortboot(int bootdelay)
 
        putc('\n');
 
-#ifdef CONFIG_SILENT_CONSOLE
-       if (abort)
-               gd->flags &= ~GD_FLG_SILENT;
-#endif
-
        return abort;
 }
 # endif        /* CONFIG_AUTOBOOT_KEYED */
 
 static int abortboot(int bootdelay)
 {
-       return __abortboot(bootdelay);
+       int abort = 0;
+
+       if (bootdelay >= 0)
+               abort = __abortboot(bootdelay);
+
+#ifdef CONFIG_SILENT_CONSOLE
+       if (abort)
+               gd->flags &= ~GD_FLG_SILENT;
+#endif
+
+       return abort;
 }
 
 static void process_fdt_options(const void *blob)