diff options
| author | Tom Rini <trini@ti.com> | 2014-02-26 16:49:58 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-02-26 16:49:58 -0500 |
| commit | eeb72e67619b98d2502fe634a3a5d9953de92ad0 (patch) | |
| tree | edea4b04062ec956158c163b13c9a31fcfdccde8 /common/board_f.c | |
| parent | 715b56fe2b47e073e6f2425e0cedba0e92a4014d (diff) | |
| parent | 1551df35f296f0a8df32f4f2054254f46e8be252 (diff) | |
| download | blackbird-obmc-uboot-eeb72e67619b98d2502fe634a3a5d9953de92ad0.tar.gz blackbird-obmc-uboot-eeb72e67619b98d2502fe634a3a5d9953de92ad0.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
arch/arm/cpu/armv7/config.mk
board/ti/am43xx/mux.c
include/configs/am43xx_evm.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'common/board_f.c')
| -rw-r--r-- | common/board_f.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/common/board_f.c b/common/board_f.c index a973b95334..e591a0e86e 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -149,13 +149,9 @@ static int display_text_info(void) #ifndef CONFIG_SANDBOX ulong bss_start, bss_end; -#ifdef CONFIG_SYS_SYM_OFFSETS - bss_start = _bss_start_ofs + _TEXT_BASE; - bss_end = _bss_end_ofs + _TEXT_BASE; -#else bss_start = (ulong)&__bss_start; bss_end = (ulong)&__bss_end; -#endif + debug("U-Boot code: %08X -> %08lX BSS: -> %08lX\n", CONFIG_SYS_TEXT_BASE, bss_start, bss_end); #endif @@ -268,8 +264,8 @@ static int zero_global_data(void) static int setup_mon_len(void) { -#ifdef CONFIG_SYS_SYM_OFFSETS - gd->mon_len = _bss_end_ofs; +#ifdef __ARM__ + gd->mon_len = (ulong)&__bss_end - (ulong)_start; #elif defined(CONFIG_SANDBOX) gd->mon_len = (ulong)&_end - (ulong)_init; #else @@ -352,11 +348,7 @@ static int setup_fdt(void) gd->fdt_blob = __dtb_dt_begin; #elif defined CONFIG_OF_SEPARATE /* FDT is at end of image */ -# ifdef CONFIG_SYS_SYM_OFFSETS - gd->fdt_blob = (void *)(_end_ofs + CONFIG_SYS_TEXT_BASE); -# else gd->fdt_blob = (ulong *)&_end; -# endif #elif defined(CONFIG_OF_HOSTFILE) if (read_fdt_from_file()) { puts("Failed to read control FDT\n"); |
