summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2014-05-01 23:42:03 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-07-09 16:49:36 +0200
commit6a1606c82e16fcca2bfe275c326ef6d792219074 (patch)
treecbfd12265f9c430510fe42ed1d376cf1c484f758
parentc61ba238f70e273aa46317fcc455c823f0e4e761 (diff)
downloadbarebox-6a1606c82e16fcca2bfe275c326ef6d792219074.tar.gz
ARM: bootm: be more clever while deciding where to put zImage
For small systems we would put the zImage at 8MiB after the start of memory, and put the DT a bit after the zImage. When we encounter an image which is bigger than 8MiB uncompressed, the kernel would try to relocate itself and overwrite the DT. Try to be more clever at zImage 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.c57
1 files changed, 29 insertions, 28 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index c63cbc0..dc7d2d9 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -237,7 +237,8 @@ static int do_bootz_linux(struct image_data *data)
int fd, ret, swap = 0;
struct zimage_header __header, *header;
void *zimage;
- u32 end;
+ u32 end, start;
+ size_t image_size;
unsigned long load_address = data->os_address;
unsigned long mem_start, mem_size, mem_free;
@@ -245,23 +246,6 @@ static int do_bootz_linux(struct image_data *data)
if (ret)
return ret;
- if (load_address == UIMAGE_INVALID_ADDRESS) {
- /*
- * The kernel should stay in the first 128MiB of RAM, recommended
- * is 32MiB into RAM so that relocation prior to decompression
- * can be avoided.
- */
- if (mem_size > SZ_64M)
- data->os_address = mem_start + SZ_32M;
- else
- data->os_address = mem_start + SZ_8M;
-
- load_address = data->os_address;
- if (bootm_verbose(data))
- printf("no os load address, defaulting to 0x%08lx\n",
- load_address);
- }
-
fd = open(data->os_file, O_RDONLY);
if (fd < 0) {
perror("open");
@@ -288,14 +272,33 @@ static int do_bootz_linux(struct image_data *data)
}
end = header->end;
+ start = header->start;
- if (swap)
+ if (swap) {
end = swab32(end);
+ start = swab32(start);
+ }
+
+ image_size = end - start;
+
+ if (load_address == UIMAGE_INVALID_ADDRESS) {
+ /*
+ * 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.
+ */
+ data->os_address = mem_start + PAGE_ALIGN(image_size * 4);
- data->os_res = request_sdram_region("zimage", load_address, end);
+ load_address = data->os_address;
+ if (bootm_verbose(data))
+ printf("no os load address, defaulting to 0x%08lx\n",
+ load_address);
+ }
+
+ data->os_res = request_sdram_region("zimage", load_address, image_size);
if (!data->os_res) {
pr_err("bootm/zImage: failed to request memory at 0x%lx to 0x%lx (%d).\n",
- load_address, load_address + end, end);
+ load_address, load_address + image_size, image_size);
ret = -ENOMEM;
goto err_out;
}
@@ -304,7 +307,8 @@ static int do_bootz_linux(struct image_data *data)
memcpy(zimage, header, sizeof(*header));
- ret = read_full(fd, zimage + sizeof(*header), end - sizeof(*header));
+ ret = read_full(fd, zimage + sizeof(*header),
+ image_size - sizeof(*header));
if (ret < 0)
goto err_out;
if (ret < end - sizeof(*header)) {
@@ -326,13 +330,10 @@ static int do_bootz_linux(struct image_data *data)
close(fd);
/*
- * 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, swap);