diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-03 09:55:13 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-03 09:55:13 +0100 |
| commit | c224cd316197132321869d859048f89da49c0162 (patch) | |
| tree | 275649e84cb143b3a389bf05c8416904b9da0dba /arch/arm/lib | |
| parent | 3cbd92bf6e96d4274e3a4f6aeceaf51d5406a0a6 (diff) | |
| parent | cc66cf109b1d2ca40c180a87fd76c2099dff2d92 (diff) | |
| download | barebox-c224cd316197132321869d859048f89da49c0162.tar.gz barebox-c224cd316197132321869d859048f89da49c0162.tar.xz | |
Merge branch 'for-next/imx'
Conflicts:
arch/arm/boards/dmo-mx6-realq7/lowlevel.c
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/pbl.lds.S | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/arch/arm/lib/pbl.lds.S b/arch/arm/lib/pbl.lds.S index 1eae8298ee..0954c89ce4 100644 --- a/arch/arm/lib/pbl.lds.S +++ b/arch/arm/lib/pbl.lds.S @@ -24,15 +24,17 @@ #include <asm-generic/barebox.lds.h> #include <asm-generic/memory_layout.h> +#ifdef CONFIG_PBL_RELOCATABLE +#define BASE 0x0 +#else +#define BASE (TEXT_BASE - SZ_2M) +#endif + OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") OUTPUT_ARCH(arm) SECTIONS { -#ifdef CONFIG_PBL_RELOCATABLE - . = 0x0; -#else - . = TEXT_BASE - SZ_2M; -#endif + . = BASE; PRE_IMAGE @@ -91,7 +93,6 @@ SECTIONS KEEP(*(.image_end)) } __image_end = .; - - _barebox_image_size = __image_end - (TEXT_BASE - SZ_2M); - _barebox_pbl_size = __bss_start - (TEXT_BASE - SZ_2M); + _barebox_image_size = __image_end - BASE; + _barebox_pbl_size = __bss_start - BASE; } |