summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-socfpga
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>2021-03-11 16:27:44 +0100
committerDinh Nguyen <dinguyen@kernel.org>2021-03-23 17:03:36 +0100
commit4483397b03536506535d611b0cb28a81a69e8edf (patch)
treed249451ae9ab502c92a219aa39efc48194b64f1a /arch/arm/mach-socfpga
parentreset: socfpga: use ARCH_INTEL_SOCFPGA also for 32-bit ARM SoCs (diff)
downloadlinux-4483397b03536506535d611b0cb28a81a69e8edf.tar.xz
linux-4483397b03536506535d611b0cb28a81a69e8edf.zip
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: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
Diffstat (limited to 'arch/arm/mach-socfpga')
-rw-r--r--arch/arm/mach-socfpga/Kconfig8
1 files changed, 2 insertions, 6 deletions
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