UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Krzysztof Kozlowski 2021-03-11 16:27:44 +01:00 committed by Dinh Nguyen
parent 225c13f0b7
commit 4483397b03
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/configs/multi_v7_defconfig
View File

@ -79,7 +79,7 @@ CONFIG_ARCH_MSM8960=y
CONFIG_ARCH_MSM8974=y CONFIG_ARCH_MSM8974=y
CONFIG_ARCH_ROCKCHIP=y CONFIG_ARCH_ROCKCHIP=y
CONFIG_ARCH_RENESAS=y CONFIG_ARCH_RENESAS=y
CONFIG_ARCH_SOCFPGA=y CONFIG_ARCH_INTEL_SOCFPGA=y
CONFIG_PLAT_SPEAR=y CONFIG_PLAT_SPEAR=y
CONFIG_ARCH_SPEAR13XX=y CONFIG_ARCH_SPEAR13XX=y
CONFIG_MACH_SPEAR1310=y CONFIG_MACH_SPEAR1310=y

2
arch/arm/configs/socfpga_defconfig
View File

@ -9,7 +9,7 @@ CONFIG_NAMESPACES=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
CONFIG_EMBEDDED=y CONFIG_EMBEDDED=y
CONFIG_PROFILING=y CONFIG_PROFILING=y
CONFIG_ARCH_SOCFPGA=y CONFIG_ARCH_INTEL_SOCFPGA=y
CONFIG_ARM_THUMBEE=y CONFIG_ARM_THUMBEE=y
CONFIG_SMP=y CONFIG_SMP=y
CONFIG_NR_CPUS=2 CONFIG_NR_CPUS=2

8
arch/arm/mach-socfpga/Kconfig
View File

@ -1,8 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
menuconfig ARCH_SOCFPGA menuconfig ARCH_INTEL_SOCFPGA
bool "Altera SOCFPGA family" bool "Altera SOCFPGA family"
depends on ARCH_MULTI_V7 depends on ARCH_MULTI_V7
select ARCH_INTEL_SOCFPGA
select ARCH_SUPPORTS_BIG_ENDIAN select ARCH_SUPPORTS_BIG_ENDIAN
select ARM_AMBA select ARM_AMBA
select ARM_GIC select ARM_GIC
@ -20,10 +19,7 @@ menuconfig ARCH_SOCFPGA
select PL310_ERRATA_753970 if PL310 select PL310_ERRATA_753970 if PL310
select PL310_ERRATA_769419 select PL310_ERRATA_769419
if ARCH_SOCFPGA if ARCH_INTEL_SOCFPGA
config ARCH_INTEL_SOCFPGA
bool
config SOCFPGA_SUSPEND config SOCFPGA_SUSPEND
bool "Suspend to RAM on SOCFPGA" bool "Suspend to RAM on SOCFPGA"
help help