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_r.c | |
| parent | 715b56fe2b47e073e6f2425e0cedba0e92a4014d (diff) | |
| parent | 1551df35f296f0a8df32f4f2054254f46e8be252 (diff) | |
| download | u-boot-eeb72e67619b98d2502fe634a3a5d9953de92ad0.tar.gz u-boot-eeb72e67619b98d2502fe634a3a5d9953de92ad0.tar.xz u-boot-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_r.c')
| -rw-r--r-- | common/board_r.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/board_r.c b/common/board_r.c index c2d0763b57..899f377e17 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -128,8 +128,8 @@ __weak int fixup_cpu(void) static int initr_reloc_global_data(void) { -#ifdef CONFIG_SYS_SYM_OFFSETS - monitor_flash_len = _end_ofs; +#ifdef __ARM__ + monitor_flash_len = _end - __image_copy_start; #elif !defined(CONFIG_SANDBOX) monitor_flash_len = (ulong)&__init_end - gd->relocaddr; #endif |