diff options
| author | Grant Likely <grant.likely@linaro.org> | 2011-03-28 09:59:01 +0000 |
|---|---|---|
| committer | Gerald Van Baren <gvb@unssw.com> | 2011-04-25 21:11:21 -0400 |
| commit | 55b0a39314562087143f439ecae57379b97db9aa (patch) | |
| tree | d3879cdbabfd2386a30a261819e3d5d9b4c0c326 /arch | |
| parent | ce6b27a874fe30e7126ae93c060277770ee85ced (diff) | |
| download | talos-obmc-uboot-55b0a39314562087143f439ecae57379b97db9aa.tar.gz talos-obmc-uboot-55b0a39314562087143f439ecae57379b97db9aa.zip | |
Respect memreserve regions specified in the device tree
If a regions is reserved in the fdt, then it should not be used. Add
the memreserve regions to the lmb so that u-boot doesn't use them to
store the initrd.
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/lib/bootm.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/lib/bootm.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index aba13f4e86..802e833a2e 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -187,6 +187,8 @@ static int bootm_linux_fdt(int machid, bootm_headers_t *images) kernel_entry = (void (*)(int, int, void *))images->ep; + boot_fdt_add_mem_rsv_regions(lmb, *of_flat_tree); + rd_len = images->rd_end - images->rd_start; ret = boot_ramdisk_high(lmb, images->rd_start, rd_len, initrd_start, initrd_end); diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index 6be22c474a..e01787dcb7 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -239,6 +239,10 @@ static int boot_body_linux(bootm_headers_t *images) int ret; +#if defined(CONFIG_OF_LIBFDT) + boot_fdt_add_mem_rsv_regions(lmb, *of_flat_tree); +#endif + /* allocate space and init command line */ ret = boot_cmdline_linux(images); if (ret) |
