| Message ID | 20230206005537.254541-138-sjg@chromium.org |
|---|---|
| State | Rejected |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | None | expand |
On Sun, Feb 05, 2023 at 05:55:04PM -0700, Simon Glass wrote: > This converts 2 usages of this option to the non-SPL form, since there is > no SPL_SEC_FIRMWARE_ARMV8_PSCI defined in Kconfig > > Signed-off-by: Simon Glass <sjg@chromium.org> This usage avoids adding the fixup for arch_fixup_fdt to SPL where we don't need it.
Hi Tom, On Wed, 8 Feb 2023 at 18:19, Tom Rini <trini@konsulko.com> wrote: > > On Sun, Feb 05, 2023 at 05:55:04PM -0700, Simon Glass wrote: > > > This converts 2 usages of this option to the non-SPL form, since there is > > no SPL_SEC_FIRMWARE_ARMV8_PSCI defined in Kconfig > > > > Signed-off-by: Simon Glass <sjg@chromium.org> > > This usage avoids adding the fixup for arch_fixup_fdt to SPL where we > don't need it. I'll add this to config_nospl Regards, Simon
diff --git a/arch/arm/cpu/armv8/cpu-dt.c b/arch/arm/cpu/armv8/cpu-dt.c index 9bfe3815e51..afb2dd6c5b6 100644 --- a/arch/arm/cpu/armv8/cpu-dt.c +++ b/arch/arm/cpu/armv8/cpu-dt.c @@ -18,7 +18,7 @@ __weak 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 (CONFIG_IS_ENABLED(SEC_FIRMWARE_ARMV8_PSCI) && + if (IS_ENABLED(CONFIG_SEC_FIRMWARE_ARMV8_PSCI) && sec_firmware_support_psci_version() == PSCI_INVALID_VER) return 0; diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c index 29020bd1c6b..69e688f677f 100644 --- a/arch/arm/lib/bootm-fdt.c +++ b/arch/arm/lib/bootm-fdt.c @@ -64,7 +64,7 @@ int arch_fixup_fdt(void *blob) #endif #if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV8_PSCI) || \ - CONFIG_IS_ENABLED(SEC_FIRMWARE_ARMV8_PSCI) + IS_ENABLED(CONFIG_SEC_FIRMWARE_ARMV8_PSCI) ret = psci_update_dt(blob); if (ret) return ret;
This converts 2 usages of this option to the non-SPL form, since there is no SPL_SEC_FIRMWARE_ARMV8_PSCI defined in Kconfig Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v1) arch/arm/cpu/armv8/cpu-dt.c | 2 +- arch/arm/lib/bootm-fdt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)