diff options
| author | Simon Glass <sjg@chromium.org> | 2014-04-10 20:01:31 -0600 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-05-29 17:49:00 -0400 |
| commit | b26440f1fa243396000536028ea00e5e185b6b6a (patch) | |
| tree | 5a49215c1ccf6fcb80d4abc476f04df39556b6d0 /common/autoboot.c | |
| parent | 0098e179e1afacb3cf595c67a98b8739dc7edcde (diff) | |
| download | u-boot-imx-b26440f1fa243396000536028ea00e5e185b6b6a.zip u-boot-imx-b26440f1fa243396000536028ea00e5e185b6b6a.tar.gz u-boot-imx-b26440f1fa243396000536028ea00e5e185b6b6a.tar.bz2 | |
Rename bootretry functions and remove #ifdefs
Add a bootretry_ prefix to these two functions, and remove the need for
the #ifdef around everything (it moves to the Makefile).
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/autoboot.c')
| -rw-r--r-- | common/autoboot.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/common/autoboot.c b/common/autoboot.c index 5f8d9c3..9843898 100644 --- 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) { |