summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2017-01-20 11:47:41 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-02-06 11:49:03 +0100
commitf7165017f41fab86c1dd97e40de2355fc64dde2f (patch)
tree5e54ee0131b1d792b3add04b77575c10da7d3302 /arch
parent80807102b904fbd418621a5865a3796107b3684d (diff)
downloadbarebox-f7165017f41fab86c1dd97e40de2355fc64dde2f.tar.gz
ARM: start: Fix boarddata allocation
It's essential that we always pass the same size value to arm_mem_barebox_image(), otherwise the result will be inconsistent. Pass arm_barebox_size instead of barebox_image_size as the latter does not contain the max bss segment size. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/start.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
index a62b0d5..171e6ad 100644
--- a/arch/arm/cpu/start.c
+++ b/arch/arm/cpu/start.c
@@ -116,7 +116,7 @@ static inline unsigned long arm_mem_boarddata(unsigned long membase,
{
unsigned long mem;
- mem = arm_mem_barebox_image(membase, endmem, barebox_image_size);
+ mem = arm_mem_barebox_image(membase, endmem, arm_barebox_size);
mem -= ALIGN(size, 64);
return mem;