summaryrefslogtreecommitdiff
path: root/board
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 /board
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 'board')
-rw-r--r--board/hymod/hymod.c4
-rw-r--r--board/hymod/input.c8
2 files changed, 3 insertions, 9 deletions
diff --git a/board/hymod/hymod.c b/board/hymod/hymod.c
index f6990e9..0183f78 100644
--- a/board/hymod/hymod.c
+++ b/board/hymod/hymod.c
@@ -415,13 +415,11 @@ last_stage_init (void)
hymod_conf_t *cp = &gd->bd->bi_hymod_conf;
int rc;
-#ifdef CONFIG_BOOT_RETRY_TIME
/*
* we use the cli_readline() function, but we also want
* command timeout enabled
*/
- init_cmd_timeout ();
-#endif
+ bootretry_init_cmd_timeout();
memset ((void *) cp, 0, sizeof (*cp));
diff --git a/board/hymod/input.c b/board/hymod/input.c
index 2f857c0..a9035d3 100644
--- a/board/hymod/input.c
+++ b/board/hymod/input.c
@@ -16,9 +16,7 @@ hymod_get_serno (const char *prompt)
int n, serno;
char *p;
-#ifdef CONFIG_BOOT_RETRY_TIME
- reset_cmd_timeout ();
-#endif
+ bootretry_reset_cmd_timeout();
n = cli_readline(prompt);
@@ -44,9 +42,7 @@ hymod_get_ethaddr (void)
for (;;) {
int n;
-#ifdef CONFIG_BOOT_RETRY_TIME
- reset_cmd_timeout ();
-#endif
+ bootretry_reset_cmd_timeout();
n = cli_readline("Enter board ethernet address: ");