summaryrefslogtreecommitdiff
path: root/common/cli_simple.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-04-10 20:01:31 -0600
committerTom Rini <trini@ti.com>2014-05-29 17:49:00 -0400
commitb26440f1fa243396000536028ea00e5e185b6b6a (patch)
tree5a49215c1ccf6fcb80d4abc476f04df39556b6d0 /common/cli_simple.c
parent0098e179e1afacb3cf595c67a98b8739dc7edcde (diff)
downloadu-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_simple.c')
-rw-r--r--common/cli_simple.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/common/cli_simple.c b/common/cli_simple.c
index 5b7e2ce..bba586e 100644
--- a/common/cli_simple.c
+++ b/common/cli_simple.c
@@ -265,14 +265,12 @@ void cli_loop(void)
int rc = 1;
for (;;) {
-#ifdef CONFIG_BOOT_RETRY_TIME
if (rc >= 0) {
/* Saw enough of a valid command to
* restart the timeout.
*/
- reset_cmd_timeout();
+ bootretry_reset_cmd_timeout();
}
-#endif
len = cli_readline(CONFIG_SYS_PROMPT);
flag = 0; /* assume no special flags for now */