summaryrefslogtreecommitdiff
path: root/lib_ppc
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-04-07 23:59:10 +0200
committerWolfgang Denk <wd@denx.de>2008-04-07 23:59:10 +0200
commite59af4b611408adcdfb5e19bc5194a7d1f8b4dc3 (patch)
treee700a523f54c5ed18bf15f832158f90a31517c85 /lib_ppc
parent23c5189e6c969255f8c91b30fdf1cf81b698329d (diff)
parent70431e8a7393b6b793f77957f95b999fc9a269b8 (diff)
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
Conflicts: lib_ppc/board.c Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'lib_ppc')
-rw-r--r--lib_ppc/board.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index f27397614eb..7d339144924 100644
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -124,6 +124,7 @@ DECLARE_GLOBAL_DATA_PTR;
#define CFG_MEM_TOP_HIDE 0
#endif
+extern ulong _start;
extern ulong __init_end;
extern ulong _end;
ulong monitor_flash_len;
@@ -439,7 +440,7 @@ void board_init_f (ulong bootflag)
* - monitor code
* - board info struct
*/
- len = (ulong)&_end - CFG_MONITOR_BASE;
+ len = (ulong)&_end - (ulong)&_start + EXC_OFF_SYS_RESET;
/*
* Subtract specified amount of memory to hide so that it won't
@@ -893,7 +894,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
sc3_read_eeprom();
#endif
-#ifdef CFG_ID_EEPROM
+#if defined (CFG_ID_EEPROM) || defined (CFG_I2C_MAC_OFFSET)
mac_read_from_eeprom();
#endif