Commit 4483397b authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Dinh Nguyen
Browse files

ARM: socfpga: drop ARCH_SOCFPGA 



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: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: default avatarDinh Nguyen <dinguyen@kernel.org>
parent 225c13f0

arch/arm/configs/multi_v7_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/configs/socfpga_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-socfpga/Kconfig

+2 −6
Original line number Diff line number Diff line 
# 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