summaryrefslogtreecommitdiffstats
path: root/lib_ppc
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-01-23 14:18:18 +0100
committerWolfgang Denk <wd@denx.de>2008-01-23 14:18:18 +0100
commited3afca32e1b28e441bc9f4b804edac47686554e (patch)
tree3cc7a6007903e1af8d7828ac5abb42e992fc3f92 /lib_ppc
parent39166b5c9e7160761419f816f995b1d8029aa4a7 (diff)
parentd59feffb42c9f174116db7a82a311df98983dfce (diff)
downloadtalos-obmc-uboot-ed3afca32e1b28e441bc9f4b804edac47686554e.tar.gz
talos-obmc-uboot-ed3afca32e1b28e441bc9f4b804edac47686554e.zip
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xx
Diffstat (limited to 'lib_ppc')
-rw-r--r--lib_ppc/board.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index bf261bea40..45d1328f21 100644
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -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) || \
OpenPOWER on IntegriCloud