diff options
author | Stefan Roese <sr@denx.de> | 2007-06-20 08:23:42 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2007-06-20 08:23:42 +0200 |
commit | 6b44466cdeabd54f9dabcd2f00d3a232a4b854a9 (patch) | |
tree | 35e536aa1eb7e781b78fff82da76e16a5e3a00f7 /lib_ppc/board.c | |
parent | b3f9ec86e388207fd03dcdf7b145b9ed080bf024 (diff) | |
parent | 5ffa76a032279bc6d3230b703eda32d13305ba13 (diff) | |
download | u-boot-imx-6b44466cdeabd54f9dabcd2f00d3a232a4b854a9.zip u-boot-imx-6b44466cdeabd54f9dabcd2f00d3a232a4b854a9.tar.gz u-boot-imx-6b44466cdeabd54f9dabcd2f00d3a232a4b854a9.tar.bz2 |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'lib_ppc/board.c')
-rw-r--r-- | lib_ppc/board.c | 6 |
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 */ |