[PATCH v3 15/15] ARM: socfpga: drop ARCH_SOCFPGA

[Dinh Nguyen]

On 3/11/21 9:27 AM, Krzysztof Kozlowski wrote:
> Simplify 32-bit and 64-bit Intel SoCFPGA Kconfig options by having only
> one for both of them.  After conversion of all
> drivers to use the new ARCH_INTEL_SOCFPGA, the remaining ARM option can
> be removed.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski at canonical.com>
> ---
>   arch/arm/configs/multi_v7_defconfig | 2 +-
>   arch/arm/configs/socfpga_defconfig  | 2 +-
>   arch/arm/mach-socfpga/Kconfig       | 8 ++------
>   3 files changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
> index 3823da605430..591b15164e3d 100644
> --- a/arch/arm/configs/multi_v7_defconfig
> +++ b/arch/arm/configs/multi_v7_defconfig
> @@ -79,7 +79,7 @@ CONFIG_ARCH_MSM8960=y
>   CONFIG_ARCH_MSM8974=y
>   CONFIG_ARCH_ROCKCHIP=y
>   CONFIG_ARCH_RENESAS=y
> -CONFIG_ARCH_SOCFPGA=y
> +CONFIG_ARCH_INTEL_SOCFPGA=y
>   CONFIG_PLAT_SPEAR=y
>   CONFIG_ARCH_SPEAR13XX=y
>   CONFIG_MACH_SPEAR1310=y
> diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig
> index 0c60eb382c80..2d9404ea52c6 100644
> --- a/arch/arm/configs/socfpga_defconfig
> +++ b/arch/arm/configs/socfpga_defconfig
> @@ -9,7 +9,7 @@ CONFIG_NAMESPACES=y
>   CONFIG_BLK_DEV_INITRD=y
>   CONFIG_EMBEDDED=y
>   CONFIG_PROFILING=y
> -CONFIG_ARCH_SOCFPGA=y
> +CONFIG_ARCH_INTEL_SOCFPGA=y
>   CONFIG_ARM_THUMBEE=y
>   CONFIG_SMP=y
>   CONFIG_NR_CPUS=2
> diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
> index e43ed0ca6860..43ddec677c0b 100644
> --- a/arch/arm/mach-socfpga/Kconfig
> +++ b/arch/arm/mach-socfpga/Kconfig
> @@ -1,8 +1,7 @@
>   # SPDX-License-Identifier: GPL-2.0-only
> -menuconfig ARCH_SOCFPGA
> +menuconfig ARCH_INTEL_SOCFPGA
>   	bool "Altera SOCFPGA family"
>   	depends on ARCH_MULTI_V7
> -	select ARCH_INTEL_SOCFPGA
>   	select ARCH_SUPPORTS_BIG_ENDIAN
>   	select ARM_AMBA
>   	select ARM_GIC
> @@ -20,10 +19,7 @@ menuconfig ARCH_SOCFPGA
>   	select PL310_ERRATA_753970 if PL310
>   	select PL310_ERRATA_769419
>   
> -if ARCH_SOCFPGA
> -config ARCH_INTEL_SOCFPGA
> -	bool
> -
> +if ARCH_INTEL_SOCFPGA
>   config SOCFPGA_SUSPEND
>   	bool "Suspend to RAM on SOCFPGA"
>   	help
> 

Acked-by: Dinh Nguyen <dinguyen at kernel.org>