diff options
| author | wdenk <wdenk> | 2003-10-28 09:14:21 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-10-28 09:14:21 +0000 |
| commit | a0f2fe524c63b3be90e18c89fc62673b1cf8fc6b (patch) | |
| tree | 3ab48d098773e7d6a46af44a8066edb2fdc4a3cb | |
| parent | a57a496f4d0582391671ebe29d23e92b6a266463 (diff) | |
* 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
| -rw-r--r-- | CHANGELOG | 7 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | include/configs/trab.h | 2 | ||||
| -rw-r--r-- | lib_nios/board.c | 13 |
4 files changed, 20 insertions, 8 deletions
diff --git a/CHANGELOG b/CHANGELOG index afae7d20547..b391732e6d3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,13 @@ Changes for U-Boot 1.0.0: ====================================================================== +* 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 + * Patch by Xiao Xianghua, 23 Oct 2003: small patch for mpc85xx @@ -203,14 +203,16 @@ cmi_mpc5xx_config: unconfig ######################################################################### ## MPC5xxx Systems ######################################################################### +MPC5200LITE \ +icecube_5200_config \ IceCube_5200_config \ IceCube_5100_config: unconfig @ >include/config.h - @[ -z "$(findstring _5200,$@)" ] || \ + @[ -z "$(findstring 5200,$@)" ] || \ { echo "#define CONFIG_MPC5200" >>include/config.h ; \ echo "... with MPC5200 processor" ; \ } - @[ -z "$(findstring _5100,$@)" ] || \ + @[ -z "$(findstring 5100,$@)" ] || \ { echo "#define CONFIG_MGT5100" >>include/config.h ; \ echo "... with MGT5100 processor" ; \ } diff --git a/include/configs/trab.h b/include/configs/trab.h index e7d1b263e6e..4d37807e7d6 100644 --- a/include/configs/trab.h +++ b/include/configs/trab.h @@ -62,6 +62,8 @@ #define CFG_DEVICE_NULLDEV 1 /* enble null device */ #define CONFIG_SILENT_CONSOLE 1 /* enable silent startup */ +#define CONFIG_VERSION_VARIABLE 1 /* include version env variable */ + /*********************************************************** * I2C stuff: * the TRAB is equipped with an ATMEL 24C04 EEPROM at diff --git a/lib_nios/board.c b/lib_nios/board.c index 8718fecc83c..ff0d9f5c769 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(); |