dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-05 18:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

treewide: use CONFIG_IS_ENABLED() for ARMV8_SEC_FIRMWARE_SUPPORT

Browse Source 
There is SPL_ARMV8_SEC_FIRMWARE_SUPPORT and ARMV8_SEC_FIRMWARE_SUPPORT.
Thus use CONFIG_IS_ENABLED() instead of the simple #ifdef.

Signed-off-by: Michael Walle <michael@walle.cc>
Acked-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michael Walle
2020-11-18 17:45:54 +01:00
committed by Tom Rini
parent 5157ea5261
commit 59b07a257c
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/armv8/cpu-dt.c
View File

@@ -9,7 +9,7 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/armv8/sec_firmware.h> #include <asm/armv8/sec_firmware.h>
#ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT #if CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT)
int psci_update_dt(void *fdt) int psci_update_dt(void *fdt)
{ {
/* /*

8
arch/arm/cpu/armv8/fsl-layerscape/fdt.c
View File

@@ -26,7 +26,7 @@
#endif #endif
#include <fsl_sec.h> #include <fsl_sec.h>
#include <asm/arch-fsl-layerscape/soc.h> #include <asm/arch-fsl-layerscape/soc.h>
#ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT #if CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT)
#include <asm/armv8/sec_firmware.h> #include <asm/armv8/sec_firmware.h>
#endif #endif
#include <asm/arch/speed.h> #include <asm/arch/speed.h>
@@ -81,7 +81,7 @@ void ft_fixup_cpu(void *blob)
"device_type", "cpu", 4); "device_type", "cpu", 4);
} }
#if defined(CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT) && \ #if CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT) && \
defined(CONFIG_SEC_FIRMWARE_ARMV8_PSCI) defined(CONFIG_SEC_FIRMWARE_ARMV8_PSCI)
int node; int node;
u32 psci_ver; u32 psci_ver;
@@ -383,7 +383,7 @@ static void fdt_fixup_msi(void *blob)
} }
#endif #endif
#ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT #if CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT)
/* Remove JR node used by SEC firmware */ /* Remove JR node used by SEC firmware */
void fdt_fixup_remove_jr(void *blob) void fdt_fixup_remove_jr(void *blob)
{ {
@@ -488,7 +488,7 @@ void ft_cpu_setup(void *blob, struct bd_info *bd)
else { else {
ccsr_sec_t __iomem *sec; ccsr_sec_t __iomem *sec;
#ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT #if CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT)
fdt_fixup_remove_jr(blob); fdt_fixup_remove_jr(blob);
fdt_fixup_kaslr(blob); fdt_fixup_kaslr(blob);
#endif #endif

2
arch/arm/cpu/armv8/fsl-layerscape/ppa.c
View File

@@ -16,7 +16,7 @@
#elif defined(CONFIG_FSL_LSCH2) #elif defined(CONFIG_FSL_LSCH2)
#include <asm/arch/immap_lsch2.h> #include <asm/arch/immap_lsch2.h>
#endif #endif
#ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT #if CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT)
#include <asm/armv8/sec_firmware.h> #include <asm/armv8/sec_firmware.h>
#endif #endif
#ifdef CONFIG_CHAIN_OF_TRUST #ifdef CONFIG_CHAIN_OF_TRUST

2
arch/arm/lib/bootm-fdt.c
View File

@@ -63,7 +63,7 @@ int arch_fixup_fdt(void *blob)
#endif #endif
#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV8_PSCI) || \ #if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV8_PSCI) || \
defined(CONFIG_SEC_FIRMWARE_ARMV8_PSCI) CONFIG_IS_ENABLED(SEC_FIRMWARE_ARMV8_PSCI)
ret = psci_update_dt(blob); ret = psci_update_dt(blob);
if (ret) if (ret)
return ret; return ret;

6
arch/arm/lib/psci-dt.c
View File

@@ -10,7 +10,7 @@
#include <linux/sizes.h> #include <linux/sizes.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <asm/psci.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> #include <asm/armv8/sec_firmware.h>
#endif #endif
@@ -64,7 +64,7 @@ int fdt_psci(void *fdt)
return nodeoff; return nodeoff;
init_psci_node: init_psci_node:
#ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT #if CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT)
psci_ver = sec_firmware_support_psci_version(); psci_ver = sec_firmware_support_psci_version();
#elif defined(CONFIG_ARMV7_PSCI_1_0) || defined(CONFIG_ARMV8_PSCI) #elif defined(CONFIG_ARMV7_PSCI_1_0) || defined(CONFIG_ARMV8_PSCI)
psci_ver = ARM_PSCI_VER_1_0; psci_ver = ARM_PSCI_VER_1_0;
@@ -85,7 +85,7 @@ init_psci_node:
return tmp; 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. * The Secure firmware framework isn't able to support PSCI version 0.1.
*/ */