X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=arch%2Farm%2Flib%2Fbootm-fdt.c;h=a51755070bc93bad6cb4e05618613afb07c58d9c;hb=a60d94b204412732409e70cb15236bd96d4da7d9;hp=2c0b56a8f36f480349c5cdaded168c217220c51a;hpb=1f9ef0dca0a1315f0a216808ade8946bcc54e2b4;p=oweals%2Fu-boot.git

diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
index 2c0b56a8f3..a51755070b 100644
--- a/arch/arm/lib/bootm-fdt.c
+++ b/arch/arm/lib/bootm-fdt.c
@@ -25,6 +25,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#ifdef CONFIG_ARCH_FIXUP_FDT
 int arch_fixup_fdt(void *blob)
 {
 	bd_t *bd = gd->bd;
@@ -52,7 +53,7 @@ int arch_fixup_fdt(void *blob)
 		return ret;
 #endif
 
-#ifdef CONFIG_ARMV7_NONSEC
+#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV8_PSCI)
 	ret = psci_update_dt(blob);
 	if (ret)
 		return ret;
@@ -60,3 +61,4 @@ int arch_fixup_fdt(void *blob)
 
 	return 0;
 }
+#endif