X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=board%2Fhymod%2Finput.c;h=a9035d340591042d4113b1af0b3019b53d3f8e9d;hb=0bf62d7bc41cc97b5ca7f6ef5ed858f56008257a;hp=998132d659491031e8a1442113d4fb0cf05080bd;hpb=cb5473205206c7f14cbb1e747f28ec75b48826e2;p=u-boot

diff --git a/board/hymod/input.c b/board/hymod/input.c
index 998132d659..a9035d3405 100644
--- a/board/hymod/input.c
+++ b/board/hymod/input.c
@@ -2,29 +2,12 @@
  * (C) Copyright 2003
  * Murray Jensen, CSIRO-MIT, <Murray.Jensen@csiro.au>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
-
-/* imports from common/main.c */
-extern char console_buffer[CONFIG_SYS_CBSIZE];
+#include <bootretry.h>
+#include <cli.h>
 
 int
 hymod_get_serno (const char *prompt)
@@ -33,11 +16,9 @@ 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 = readline (prompt);
+		n = cli_readline(prompt);
 
 		if (n < 0)
 			return (n);
@@ -61,11 +42,9 @@ hymod_get_ethaddr (void)
 	for (;;) {
 		int n;
 
-#ifdef CONFIG_BOOT_RETRY_TIME
-		reset_cmd_timeout ();
-#endif
+		bootretry_reset_cmd_timeout();
 
-		n = readline ("Enter board ethernet address: ");
+		n = cli_readline("Enter board ethernet address: ");
 
 		if (n < 0)
 			return (n);
@@ -76,7 +55,6 @@ hymod_get_ethaddr (void)
 		if (n == 17) {
 			int i;
 			char *p, *q;
-			uchar ea[6];
 
 			/* see if it looks like an ethernet address */
 
@@ -85,7 +63,7 @@ hymod_get_ethaddr (void)
 			for (i = 0; i < 6; i++) {
 				char term = (i == 5 ? '\0' : ':');
 
-				ea[i] = simple_strtol (p, &q, 16);
+				(void)simple_strtol (p, &q, 16);
 
 				if ((q - p) != 2 || *q++ != term)
 					break;