diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-03-27 21:20:29 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-03-27 21:20:29 +0200 |
| commit | c04bf5e9a45d7335681352faa125193258f8e976 (patch) | |
| tree | ab512a5a8356b6f492100925acb63638a7c10ce9 /arch/m68k | |
| parent | b0c5ceb305054aadf2f810b0b7bfcc94926b78ad (diff) | |
| parent | 05858736f5f1050d776571451995db81e3f5a5d7 (diff) | |
| download | u-boot-imx-c04bf5e9a45d7335681352faa125193258f8e976.zip u-boot-imx-c04bf5e9a45d7335681352faa125193258f8e976.tar.gz u-boot-imx-c04bf5e9a45d7335681352faa125193258f8e976.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/lib/board.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c index 7867ba5..f824b34 100644 --- a/arch/m68k/lib/board.c +++ b/arch/m68k/lib/board.c @@ -76,7 +76,7 @@ static char *failed = "*** failed ***\n"; #include <environment.h> extern ulong __init_end; -extern ulong _end; +extern ulong __bss_end__; extern void timer_init(void); @@ -252,7 +252,7 @@ board_init_f (ulong bootflag) * - monitor code * - board info struct */ - len = (ulong)&_end - CONFIG_SYS_MONITOR_BASE; + len = (ulong)&__bss_end__ - CONFIG_SYS_MONITOR_BASE; addr = CONFIG_SYS_SDRAM_BASE + gd->ram_size; |