summaryrefslogtreecommitdiff
path: root/lib_ppc/board.c
diff options
context:
space:
mode:
authorKim Phillips <kim.phillips@freescale.com>2007-06-14 19:56:58 -0500
committerKim Phillips <kim.phillips@freescale.com>2007-06-14 19:56:58 -0500
commitb721ff745d3e5b4fe6bb8db430553d54dba4bd17 (patch)
tree8f267466c28352bac8e2f59358411d0860bb0bcf /lib_ppc/board.c
parent5b1313fb2758ffce8b624457f777d8cc6709608d (diff)
parent9912121f7ed804ea58fd62f3f230b5dcfc357d88 (diff)
downloadu-boot-imx-b721ff745d3e5b4fe6bb8db430553d54dba4bd17.zip
u-boot-imx-b721ff745d3e5b4fe6bb8db430553d54dba4bd17.tar.gz
u-boot-imx-b721ff745d3e5b4fe6bb8db430553d54dba4bd17.tar.bz2
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'lib_ppc/board.c')
-rw-r--r--lib_ppc/board.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index 9e85cdd..c4fc580 100644
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -76,7 +76,7 @@
extern int update_flash_size (int flash_size);
#endif
-#if defined(CONFIG_SOLIDCARD3)
+#if defined(CONFIG_SC3)
extern void sc3_read_eeprom(void);
#endif
@@ -820,7 +820,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
#endif /* CONFIG_405GP, CONFIG_405EP */
#endif /* CFG_EXTBDINFO */
-#if defined(CONFIG_SOLIDCARD3)
+#if defined(CONFIG_SC3)
sc3_read_eeprom();
#endif
s = getenv ("ethaddr");
@@ -929,7 +929,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
defined(CONFIG_KUP4X) || \
defined(CONFIG_LWMON) || \
defined(CONFIG_PCU_E) || \
- defined(CONFIG_SOLIDCARD3) || \
+ defined(CONFIG_SC3) || \
defined(CONFIG_W7O) || \
defined(CONFIG_MISC_INIT_R)
/* miscellaneous platform dependent initialisations */