Merge branch 'u-boot-sh/rmobile' into 'u-boot-arm/master'

[oweals/u-boot.git] / board / hymod / hymod.c

diff --git a/board/hymod/hymod.c b/board/hymod/hymod.c
index 5fec914f5ad525c6f519b10fd315af3670d980f7..0183f781dec43dffe706f345de0d59ef846d0a07 100644 (file)
--- a/board/hymod/hymod.c
+++ b/board/hymod/hymod.c
@@ -8,6 +8,8 @@
  */
 
 #include <common.h>
+#include <bootretry.h>
+#include <cli.h>
 #include <mpc8260.h>
 #include <mpc8260_irq.h>
 #include <ioports.h>
@@ -413,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 readline () function, but we also want
+        * 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));