aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/lib/bootm-fdt.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/lib/bootm-fdt.c')
-rw-r--r--arch/arm/lib/bootm-fdt.c11
1 files changed, 10 insertions, 1 deletions
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