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/cli_hush.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/cli_hush.c')
| -rw-r--r-- | common/cli_hush.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/common/cli_hush.c b/common/cli_hush.c index d6544ae..0f069b0 100644 --- a/common/cli_hush.c +++ b/common/cli_hush.c @@ -1000,12 +1000,7 @@ static void get_user_input(struct in_str *i) int n; static char the_command[CONFIG_SYS_CBSIZE + 1]; -#ifdef CONFIG_BOOT_RETRY_TIME -# ifndef CONFIG_RESET_TO_RETRY -# error "This currently only works with CONFIG_RESET_TO_RETRY enabled" -# endif - reset_cmd_timeout(); -#endif + bootretry_reset_cmd_timeout(); i->__promptme = 1; if (i->promptmode == 1) { n = cli_readline(CONFIG_SYS_PROMPT); |