aboutsummaryrefslogtreecommitdiff
path: root/common/cmd_bootm.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@linaro.org>2011-03-28 09:59:01 +0000
committerGerald Van Baren <gvb@unssw.com>2011-04-25 21:11:21 -0400
commit55b0a39314562087143f439ecae57379b97db9aa (patch)
treed3879cdbabfd2386a30a261819e3d5d9b4c0c326 /common/cmd_bootm.c
parentce6b27a874fe30e7126ae93c060277770ee85ced (diff)
downloadu-boot-linaro-natty-55b0a39314562087143f439ecae57379b97db9aa.tar.gz
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 'common/cmd_bootm.c')
-rw-r--r--common/cmd_bootm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index a23e46569..1966da48c 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -547,6 +547,8 @@ int do_bootm_subcommand (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv
#if defined(CONFIG_OF_LIBFDT)
case BOOTM_STATE_FDT:
{
+ boot_fdt_add_mem_rsv_regions(&images.lmb,
+ images.ft_addr);
ret = boot_relocate_fdt(&images.lmb,
&images.ft_addr, &images.ft_len);
break;