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

diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
index 76b75d8e46..a51755070b 100644
--- a/arch/arm/lib/bootm-fdt.c
+++ b/arch/arm/lib/bootm-fdt.c
@@ -21,9 +21,11 @@
 #include <asm/armv7.h>
 #endif
 #include <asm/psci.h>
+#include <asm/spin_table.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#ifdef CONFIG_ARCH_FIXUP_FDT
 int arch_fixup_fdt(void *blob)
 {
 	bd_t *bd = gd->bd;
@@ -45,7 +47,13 @@ int arch_fixup_fdt(void *blob)
 	if (ret)
 		return ret;
 
-#ifdef CONFIG_ARMV7_NONSEC
+#ifdef CONFIG_ARMV8_SPIN_TABLE
+	ret = spin_table_update_dt(blob);
+	if (ret)
+		return ret;
+#endif
+
+#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV8_PSCI)
 	ret = psci_update_dt(blob);
 	if (ret)
 		return ret;
@@ -53,3 +61,4 @@ int arch_fixup_fdt(void *blob)
 
 	return 0;
 }
+#endif