diff options
| author | Tom Rini <trini@konsulko.com> | 2020-12-07 17:16:23 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-12-07 17:16:23 -0500 |
| commit | cd833de0593fa2346dddab21eff6ccf2411380d3 (patch) | |
| tree | f87835b392c62414199e5fb926d0f4f63d92ec9e /arch/arm/lib/psci-dt.c | |
| parent | 5157ea526142ace7b0b19939b0d31ace4276cda7 (diff) | |
| parent | 51bb33846ad2b045799d2c43ca773fafa36e6ec8 (diff) | |
Merge branch '2020-12-07-bootm-and-spl-atf-improvements' into next
- Series to improve "bootm" by allowing variable evaluation within the
cmdline we would be passing. This will help with Chrome OS but can be
useful elsewhere.
- Improve ATF (TF-A) support within SPL.
Diffstat (limited to 'arch/arm/lib/psci-dt.c')
| -rw-r--r-- | arch/arm/lib/psci-dt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/lib/psci-dt.c b/arch/arm/lib/psci-dt.c index 0ed29a43f10..903b3357048 100644 --- a/arch/arm/lib/psci-dt.c +++ b/arch/arm/lib/psci-dt.c @@ -10,7 +10,7 @@ #include <linux/sizes.h> #include <linux/kernel.h> #include <asm/psci.h> -#ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT +#if CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT) #include <asm/armv8/sec_firmware.h> #endif @@ -64,7 +64,7 @@ int fdt_psci(void *fdt) return nodeoff; init_psci_node: -#ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT +#if CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT) psci_ver = sec_firmware_support_psci_version(); #elif defined(CONFIG_ARMV7_PSCI_1_0) || defined(CONFIG_ARMV8_PSCI) psci_ver = ARM_PSCI_VER_1_0; @@ -85,7 +85,7 @@ init_psci_node: return tmp; } -#ifndef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT +#if !CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT) /* * The Secure firmware framework isn't able to support PSCI version 0.1. */ |