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 <michal.simek@xilinx.com>

diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
index 3a2c440abbdef0752cd02f790fb635e96aa6ef0b..d4f1578e9e96fcdbd1434b5c5e663339844ada83 100644 (file)
--- 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 9fc0cb7a5e12765ce3c048a2945a855665ae5191..0c1298a31e733c3e528f7d49a70088f27deece86 100644 (file)
--- 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(&params);
                setup_end_tag(gd->bd);
+       } else {
+               printf("FDT and ATAGS support not compiled in - hanging\n");
+               hang();
        }
 }