X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=board%2Fhymod%2Fhymod.c;h=0183f781dec43dffe706f345de0d59ef846d0a07;hb=59a9cfdd16ad7ab14f22697bf1e049c6bea0d3e2;hp=2af3049896ef0fa7e8281fa5a9c029a778fcb4e6;hpb=156feb90d200f186cdfd856d7f6f1878bb1bec1e;p=karo-tx-uboot.git

diff --git a/board/hymod/hymod.c b/board/hymod/hymod.c
index 2af3049896..0183f781de 100644
--- a/board/hymod/hymod.c
+++ b/board/hymod/hymod.c
@@ -2,28 +2,14 @@
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * 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+
  *
  * Hacked for the Hymod board by Murray.Jensen@csiro.au, 20-Oct-00
  */
 
 #include <common.h>
+#include <bootretry.h>
+#include <cli.h>
 #include <mpc8260.h>
 #include <mpc8260_irq.h>
 #include <ioports.h>
@@ -378,7 +364,7 @@ initdram (int board_type)
 	 *
 	 * "At system reset, initialization software must set up the
 	 *  programmable parameters in the memory controller banks registers
-	 *  (ORx, BRx, P/LSDMR). After all memory parameters are conÞgured,
+	 *  (ORx, BRx, P/LSDMR). After all memory parameters are configured,
 	 *  system software should execute the following initialization sequence
 	 *  for each SDRAM device.
 	 *
@@ -429,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));