From bb89d52dbee5c6b834d7a5d568b0711ac0e960bd Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 13 Jan 2015 15:26:50 +0100 Subject: [PATCH] ARM: lib: Revert ARM core changes These chagnes have been done in: "Merge tag 'v2013.07' into xilinx/master-next" (sha1: 6978377d4b022d7fd9a8c6f720ebc2e5daaeb173) Boot process looks good now that's why revert this patch. Signed-off-by: Michal Simek --- arch/arm/lib/bootm-fdt.c | 19 ++++++++++++++++++- arch/arm/lib/bootm.c | 3 +++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c index 3a2c440abbd..d4f1578e9e9 100644 --- a/arch/arm/lib/bootm-fdt.c +++ b/arch/arm/lib/bootm-fdt.c @@ -23,5 +23,22 @@ DECLARE_GLOBAL_DATA_PTR; int arch_fixup_fdt(void *blob) { - return 0; + bd_t *bd = gd->bd; + int bank, ret; + u64 start[CONFIG_NR_DRAM_BANKS]; + u64 size[CONFIG_NR_DRAM_BANKS]; + + for (bank = 0; bank < CONFIG_NR_DRAM_BANKS; bank++) { + start[bank] = bd->bi_dram[bank].start; + size[bank] = bd->bi_dram[bank].size; + } + + ret = fdt_fixup_memory_banks(blob, start, size, CONFIG_NR_DRAM_BANKS); +#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT) + if (ret) + return ret; + + ret = armv7_update_dt(blob); +#endif + return ret; } diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 9fc0cb7a5e1..0c1298a31e7 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -231,6 +231,9 @@ static void boot_prep_linux(bootm_headers_t *images) } setup_board_tags(¶ms); setup_end_tag(gd->bd); + } else { + printf("FDT and ATAGS support not compiled in - hanging\n"); + hang(); } } -- 2.47.3