summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2014-05-01 23:42:04 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-07-09 16:49:41 +0200
commit950c75d1e995b6730625be0c2e310d88693333fd (patch)
tree395b7e0d56bf3d39782dc56f2ca1ed3b75f9f118
parent6a1606c82e16fcca2bfe275c326ef6d792219074 (diff)
downloadbarebox-950c75d1e995b6730625be0c2e310d88693333fd.tar.gz
ARM: bootm: fix default uImage placement
For small systems we would put the zImage at 32KiB after the start of memory, and put the DT a bit after the uImage. The kernel will always try to relocate itself and overwrite the DT. Try to be more clever at uImage placement to avoid triggering the kernel relocation. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/lib/bootm.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index dc7d2d9..8035468 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -127,7 +127,13 @@ static int do_bootm_linux(struct image_data *data)
load_address = data->os_address;
if (load_address == UIMAGE_INVALID_ADDRESS) {
- load_address = mem_start + SZ_32K;
+ /*
+ * Just use a conservative default of 4 times the size of the
+ * compressed image, to avoid the need for the kernel to
+ * relocate itself before decompression.
+ */
+ load_address = mem_start + PAGE_ALIGN(
+ uimage_get_size(data->os, data->os_num) * 4);
if (bootm_verbose(data))
printf("no os load address, defaulting to 0x%08lx\n",
load_address);
@@ -138,13 +144,10 @@ static int do_bootm_linux(struct image_data *data)
return ret;
/*
- * Put devicetree/initrd at maximum to 128MiB into RAM to not
- * risk to put it outside of lowmem.
+ * put oftree/initrd close behind compressed kernel image to avoid
+ * placing it outside of the kernels lowmem.
*/
- if (mem_size > SZ_256M)
- mem_free = mem_start + SZ_128M;
- else
- mem_free = PAGE_ALIGN(data->os_res->end + SZ_1M);
+ mem_free = PAGE_ALIGN(data->os_res->end + SZ_1M);
return __do_bootm_linux(data, mem_free, 0);
}