diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:18 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:18 +0200 |
commit | 8762b3046e0724e9318944cf03cff523f4d3bb7a (patch) | |
tree | a3934e0bfa16e896ca6e9f9df43047cc40b89343 /arch/arm/lib | |
parent | a1c68f678f435a41379c4d3b542cb1b901e182b9 (diff) | |
parent | a2d5ca0fd92a6f3569b1f9d12a7a224b69328351 (diff) | |
download | barebox-8762b3046e0724e9318944cf03cff523f4d3bb7a.tar.gz barebox-8762b3046e0724e9318944cf03cff523f4d3bb7a.tar.xz |
Merge branch 'for-next/arm'
Diffstat (limited to 'arch/arm/lib')
-rw-r--r-- | arch/arm/lib/bootm.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index d9b9111ce1..ffd56edfd3 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -414,6 +414,11 @@ static int do_bootm_aimage(struct image_data *data) int to_read; struct android_header_comp *cmp; unsigned long mem_free; + unsigned long mem_start, mem_size; + + ret = sdram_start_and_size(&mem_start, &mem_size); + if (ret) + return ret; fd = open(data->os_file, O_RDONLY); if (fd < 0) { @@ -447,8 +452,17 @@ static int do_bootm_aimage(struct image_data *data) cmp = &header->kernel; data->os_res = request_sdram_region("akernel", cmp->load_addr, cmp->size); if (!data->os_res) { - ret = -ENOMEM; - goto err_out; + pr_err("Cannot request region 0x%08x - 0x%08x, using default load address\n", + cmp->load_addr, cmp->size); + + data->os_address = mem_start + PAGE_ALIGN(cmp->size * 4); + data->os_res = request_sdram_region("akernel", data->os_address, cmp->size); + if (!data->os_res) { + pr_err("Cannot request region 0x%08x - 0x%08x\n", + cmp->load_addr, cmp->size); + ret = -ENOMEM; + goto err_out; + } } ret = aimage_load_resource(fd, data->os_res, buf, header->page_size); |