Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

[u-boot] / board / hymod / input.c

diff --git a/board/hymod/input.c b/board/hymod/input.c
index 59ad6aa3ed92a97f9369111de6d4ef4719d43048..a9035d340591042d4113b1af0b3019b53d3f8e9d 100644 (file)
--- a/board/hymod/input.c
+++ b/board/hymod/input.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <bootretry.h>
 #include <cli.h>
 
 int
@@ -15,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);
 
@@ -43,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: ");