ARM: Default to using optimized memset and memcpy routines

[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 a51755070bc93bad6cb4e05618613afb07c58d9c..d84789c7a8a458af5903ae694db597d458a3f2cb 100644 (file)
--- a/arch/arm/lib/bootm-fdt.c
+++ b/arch/arm/lib/bootm-fdt.c
@@ -25,7 +25,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifdef CONFIG_ARCH_FIXUP_FDT
 int arch_fixup_fdt(void *blob)
 {
        bd_t *bd = gd->bd;
@@ -53,7 +52,8 @@ int arch_fixup_fdt(void *blob)
                return ret;
 #endif
 
-#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV8_PSCI)
+#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV8_PSCI) || \
+       defined(CONFIG_SEC_FIRMWARE_ARMV8_PSCI)
        ret = psci_update_dt(blob);
        if (ret)
                return ret;
@@ -61,4 +61,3 @@ int arch_fixup_fdt(void *blob)
 
        return 0;
 }
-#endif