ARM: Clean up CONFIG_ARMV7_NONSEC/VIRT/PSCI conditions

[u-boot] / arch / arm / cpu / armv7 / virt-dt.c

diff --git a/arch/arm/cpu/armv7/virt-dt.c b/arch/arm/cpu/armv7/virt-dt.c
index ad19e4c47c2e9947358c1cbcbcd24a5370e94436..caaaaabccd6956c762a51296006769b22e78877a 100644 (file)
--- a/arch/arm/cpu/armv7/virt-dt.c
+++ b/arch/arm/cpu/armv7/virt-dt.c
@@ -88,10 +88,12 @@ static int fdt_psci(void *fdt)
        return 0;
 }
 
-int armv7_update_dt(void *fdt)
+int psci_update_dt(void *fdt)
 {
+#ifdef CONFIG_ARMV7_NONSEC
        if (!armv7_boot_nonsec())
                return 0;
+#endif
 #ifndef CONFIG_ARMV7_SECURE_BASE
        /* secure code lives in RAM, keep it alive */
        fdt_add_mem_rsv(fdt, (unsigned long)__secure_start,