From a0f2fe524c63b3be90e18c89fc62673b1cf8fc6b Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Tue, 28 Oct 2003 09:14:21 +0000
Subject: * Patch by Stephan Linz, 28 Oct 2003:   fix init sequence error for
 NIOS port

* Allow lowercase spelling for IceCube_5200; support MPC5200LITE name

* Add CONFIG_VERSION_VARIABLE to TRAB configuration
---
 lib_nios/board.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'lib_nios/board.c')

diff --git a/lib_nios/board.c b/lib_nios/board.c
index 8718fecc83..ff0d9f5c76 100644
--- a/lib_nios/board.c
+++ b/lib_nios/board.c
@@ -132,12 +132,6 @@ void board_init (void)
 	bd->bi_sramstart= CFG_SRAM_BASE;
 	bd->bi_sramsize	= CFG_SRAM_SIZE;
 	bd->bi_baudrate	= CONFIG_BAUDRATE;
-	bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
-	s = getenv ("ethaddr");
-	for (i = 0; i < 6; ++i) {
-		bd->bi_enetaddr[i] = s ? simple_strtoul (s, &e, 16) : 0;
-		if (s) s = (*e) ? e + 1 : e;
-	}
 
 	for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
 		if ((*init_fnc_ptr) () != 0) {
@@ -151,6 +145,13 @@ void board_init (void)
 	malloc_bin_reloc();
 	env_relocate();
 
+	bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
+	s = getenv ("ethaddr");
+	for (i = 0; i < 6; ++i) {
+		bd->bi_enetaddr[i] = s ? simple_strtoul (s, &e, 16) : 0;
+		if (s) s = (*e) ? e + 1 : e;
+	}
+
 	devices_init();
 	jumptable_init();
 	console_init_r();
-- 
cgit