Rename bootretry functions and remove #ifdefs

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

diff --git a/common/autoboot.c b/common/autoboot.c
index 5f8d9c3445cdc6e7c873e7e9822254f901a05d6f..984389885f2c0a66007a490e1e29e75888e3e337 100644 (file)
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -113,11 +113,9 @@ static int abortboot_keyed(int bootdelay)
                                                delaykey[i].retry ? "delay" :
                                                "stop");
 
-#  ifdef CONFIG_BOOT_RETRY_TIME
                                /* don't retry auto boot */
                                if (!delaykey[i].retry)
                                        bootretry_dont_retry();
-#  endif
                                abort = 1;
                        }
                }
@@ -305,9 +303,7 @@ void bootdelay_process(void)
 #if defined(CONFIG_MENU_SHOW)
        bootdelay = menu_show(bootdelay);
 #endif
-# ifdef CONFIG_BOOT_RETRY_TIME
-       init_cmd_timeout();
-# endif        /* CONFIG_BOOT_RETRY_TIME */
+       bootretry_init_cmd_timeout();
 
 #ifdef CONFIG_POST
        if (gd->flags & GD_FLG_POSTFAIL) {