Merge git://git.denx.de/u-boot-sunxi

[u-boot] / arch / arm / lib / bootm-fdt.c

diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
index 2c0b56a8f36f480349c5cdaded168c217220c51a..eaa817b9ac8ef08877cc1652a5fc1ee1e4aefecf 100644 (file)
--- a/arch/arm/lib/bootm-fdt.c
+++ b/arch/arm/lib/bootm-fdt.c
@@ -27,8 +27,10 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int arch_fixup_fdt(void *blob)
 {
+       int ret = 0;
+#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_OF_LIBFDT)
        bd_t *bd = gd->bd;
-       int bank, ret;
+       int bank;
        u64 start[CONFIG_NR_DRAM_BANKS];
        u64 size[CONFIG_NR_DRAM_BANKS];
 
@@ -42,9 +44,11 @@ int arch_fixup_fdt(void *blob)
 #endif
        }
 
+#ifdef CONFIG_OF_LIBFDT
        ret = fdt_fixup_memory_banks(blob, start, size, CONFIG_NR_DRAM_BANKS);
        if (ret)
                return ret;
+#endif
 
 #ifdef CONFIG_ARMV8_SPIN_TABLE
        ret = spin_table_update_dt(blob);
@@ -52,10 +56,12 @@ int arch_fixup_fdt(void *blob)
                return ret;
 #endif
 
-#ifdef CONFIG_ARMV7_NONSEC
+#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV8_PSCI) || \
+       defined(CONFIG_SEC_FIRMWARE_ARMV8_PSCI)
        ret = psci_update_dt(blob);
        if (ret)
                return ret;
+#endif
 #endif
 
        return 0;