diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-04-27 21:45:31 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-27 21:45:31 +0200 |
| commit | 34b5fc4d8bba594d53a15be970ca78b03db9d7f5 (patch) | |
| tree | fd9491a405ba0edd8c60e4f9f03916a8a1e891b9 /arch/arm | |
| parent | 547bea12cc9dd72b4e1cd0383d7f1ecb0e43e139 (diff) | |
| parent | 55b0a39314562087143f439ecae57379b97db9aa (diff) | |
| download | u-boot-imx-34b5fc4d8bba594d53a15be970ca78b03db9d7f5.zip u-boot-imx-34b5fc4d8bba594d53a15be970ca78b03db9d7f5.tar.gz u-boot-imx-34b5fc4d8bba594d53a15be970ca78b03db9d7f5.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-fdt
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/lib/bootm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 7734953..802e833 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -178,7 +178,6 @@ static int bootm_linux_fdt(int machid, bootm_headers_t *images) { ulong rd_len; void (*kernel_entry)(int zero, int dt_machid, void *dtblob); - ulong bootmap_base = getenv_bootm_low(); ulong of_size = images->ft_len; char **of_flat_tree = &images->ft_addr; ulong *initrd_start = &images->initrd_start; @@ -188,13 +187,15 @@ 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); if (ret) return ret; - ret = boot_relocate_fdt(lmb, bootmap_base, of_flat_tree, &of_size); + ret = boot_relocate_fdt(lmb, of_flat_tree, &of_size); if (ret) return ret; |