Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xx

This commit is contained in:
Wolfgang Denk
2008-01-23 14:18:18 +01:00
5 changed files with 80 additions and 47 deletions

View File

@@ -851,6 +851,11 @@ void board_init_r (gd_t *id, ulong dest_addr)
#if defined(CONFIG_SC3)
sc3_read_eeprom();
#endif
#ifdef CFG_ID_EEPROM
mac_read_from_eeprom();
#endif
s = getenv ("ethaddr");
#if defined (CONFIG_MBX) || \
defined (CONFIG_RPXCLASSIC) || \
@@ -918,10 +923,6 @@ void board_init_r (gd_t *id, ulong dest_addr)
}
#endif
#ifdef CFG_ID_EEPROM
mac_read_from_eeprom();
#endif
#if defined(CONFIG_TQM8xxL) || defined(CONFIG_TQM8260) || \
defined(CONFIG_TQM8272) || \
defined(CONFIG_CCM) || defined(CONFIG_KUP4K) || \