diff options
| author | Tom Rini <trini@konsulko.com> | 2022-04-27 09:19:41 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-04-27 09:19:41 -0400 |
| commit | 8b2b125e95c44bb007b4573945f4aedb8a56222c (patch) | |
| tree | 0eed8a3f6e53131583134e00258984f144845f31 /arch/arm/cpu/armv8/cpu-dt.c | |
| parent | 24df831cd4ab70fe526e561b07ca37c8b8aa544c (diff) | |
| parent | 182d45ddff8944e291c805d94a01d7dd29d0d3b6 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-mpc85xx
fsl-qoriq: Fixes and updates on fsl-layerscape
mpc85xx: fixes and code cleanup
Diffstat (limited to 'arch/arm/cpu/armv8/cpu-dt.c')
| -rw-r--r-- | arch/arm/cpu/armv8/cpu-dt.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/cpu/armv8/cpu-dt.c b/arch/arm/cpu/armv8/cpu-dt.c index 61c38b17cbf..9bfe3815e51 100644 --- a/arch/arm/cpu/armv8/cpu-dt.c +++ b/arch/arm/cpu/armv8/cpu-dt.c @@ -8,9 +8,9 @@ #include <asm/psci.h> #include <asm/system.h> #include <asm/armv8/sec_firmware.h> +#include <linux/libfdt.h> -#if CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT) -int psci_update_dt(void *fdt) +__weak int psci_update_dt(void *fdt) { /* * If the PSCI in SEC Firmware didn't work, avoid to update the @@ -18,8 +18,10 @@ int psci_update_dt(void *fdt) * number to support detecting PSCI dynamically and then switching * the SMP boot method between PSCI and spin-table. */ - if (sec_firmware_support_psci_version() == PSCI_INVALID_VER) + if (CONFIG_IS_ENABLED(SEC_FIRMWARE_ARMV8_PSCI) && + sec_firmware_support_psci_version() == PSCI_INVALID_VER) return 0; + fdt_psci(fdt); #if defined(CONFIG_ARMV8_PSCI) && !defined(CONFIG_ARMV8_SECURE_BASE) @@ -30,4 +32,3 @@ int psci_update_dt(void *fdt) return 0; } -#endif |