[PATCH 1/8] treewide: use CONFIG_IS_ENABLED() for ARMV8_SEC_FIRMWARE_SUPPORT

[Michal Simek]

On 16. 11. 20 22:47, Michael Walle wrote:
> 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 at walle.cc>
> ---
>  arch/arm/cpu/armv8/cpu-dt.c             | 2 +-
>  arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 8 ++++----
>  arch/arm/cpu/armv8/fsl-layerscape/ppa.c | 2 +-
>  arch/arm/lib/bootm-fdt.c                | 2 +-
>  arch/arm/lib/psci-dt.c                  | 6 +++---
>  5 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/arch/arm/cpu/armv8/cpu-dt.c b/arch/arm/cpu/armv8/cpu-dt.c
> index 97d4473a68..61c38b17cb 100644
> --- a/arch/arm/cpu/armv8/cpu-dt.c
> +++ b/arch/arm/cpu/armv8/cpu-dt.c
> @@ -9,7 +9,7 @@
>  #include <asm/system.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)
>  {
>  	/*
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
> index 6d3391db3b..598ee2ffa2 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
> @@ -26,7 +26,7 @@
>  #endif
>  #include <fsl_sec.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>
>  #endif
>  #include <asm/arch/speed.h>
> @@ -81,7 +81,7 @@ void ft_fixup_cpu(void *blob)
>  						    "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)
>  	int node;
>  	u32 psci_ver;
> @@ -383,7 +383,7 @@ static void fdt_fixup_msi(void *blob)
>  }
>  #endif
>  
> -#ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
> +#if CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT)
>  /* Remove JR node used by SEC firmware */
>  void fdt_fixup_remove_jr(void *blob)
>  {
> @@ -488,7 +488,7 @@ void ft_cpu_setup(void *blob, struct bd_info *bd)
>  	else {
>  		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_kaslr(blob);
>  #endif
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
> index 1ddb267093..2285296ea0 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
> @@ -16,7 +16,7 @@
>  #elif defined(CONFIG_FSL_LSCH2)
>  #include <asm/arch/immap_lsch2.h>
>  #endif
> -#ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
> +#if CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT)
>  #include <asm/armv8/sec_firmware.h>
>  #endif
>  #ifdef CONFIG_CHAIN_OF_TRUST
> diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
> index 02a49a8e10..fe46a7d7c9 100644
> --- a/arch/arm/lib/bootm-fdt.c
> +++ b/arch/arm/lib/bootm-fdt.c
> @@ -63,7 +63,7 @@ int arch_fixup_fdt(void *blob)
>  #endif
>  
>  #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);
>  	if (ret)
>  		return ret;
> diff --git a/arch/arm/lib/psci-dt.c b/arch/arm/lib/psci-dt.c
> index 0ed29a43f1..903b335704 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.
>  	 */
> 

Acked-by: Michal Simek <michal.simek at xilinx.com>
M