summaryrefslogtreecommitdiffstats
path: root/arch/arm/pbl
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-10-15 16:24:22 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-02-04 15:52:41 +0100
commitc2ef9c4af208ce632b69a361b749c211cd97a03b (patch)
tree1de1af43b085da5e28bd934d3d7b9d2ac2889a4e /arch/arm/pbl
parent46fa9020643607c66781ef8b373f0983ca4815fb (diff)
downloadbarebox-c2ef9c4af208ce632b69a361b749c211cd97a03b.tar.gz
barebox-c2ef9c4af208ce632b69a361b749c211cd97a03b.tar.xz
ARM: disable HAVE_CONFIGURABLE_MEMORY_LAYOUT
HAVE_CONFIGURABLE_MEMORY_LAYOUT was first meant as a feature, now it's a feature to remove it. barebox on ARM now completely uses the memory passed in from the lowlevel code and configures the malloc area and stack space during runtime making it obsolete to hardcode these values. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/pbl')
-rw-r--r--arch/arm/pbl/zbarebox.lds.S8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/pbl/zbarebox.lds.S b/arch/arm/pbl/zbarebox.lds.S
index 37af4e913e..564b3c6170 100644
--- a/arch/arm/pbl/zbarebox.lds.S
+++ b/arch/arm/pbl/zbarebox.lds.S
@@ -20,7 +20,7 @@
* MA 02111-1307 USA
*
*/
-
+#include <sizes.h>
#include <asm-generic/barebox.lds.h>
#include <asm-generic/memory_layout.h>
@@ -29,7 +29,7 @@ OUTPUT_ARCH(arm)
ENTRY(pbl_start)
SECTIONS
{
- . = HEAD_TEXT_BASE;
+ . = TEXT_BASE - SZ_2M;
PRE_IMAGE
@@ -71,6 +71,6 @@ SECTIONS
}
__piggydata_end = .;
- _barebox_image_size = __piggydata_end - HEAD_TEXT_BASE;
- _barebox_pbl_size = __bss_start - HEAD_TEXT_BASE;
+ _barebox_image_size = __piggydata_end - (TEXT_BASE - SZ_2M);
+ _barebox_pbl_size = __bss_start - (TEXT_BASE - SZ_2M);
}