openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: socfpga: introduce common ARCH_INTEL_SOCFPGA 

Simplify 32-bit and 64-bit Intel SoCFPGA Kconfig options by having only
one for both of them.  This the common practice for other platforms.
Additionally, the ARCH_SOCFPGA is too generic as SoCFPGA designs come
from multiple vendors.

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:25:32 +01:00 committed by Dinh Nguyen
parent 3b218baa74
commit 910499e133
7 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/Kconfig
View File

@ -1320,7 +1320,7 @@ config ARM_PSCI
# selected platforms. # selected platforms.
config ARCH_NR_GPIO config ARCH_NR_GPIO
int int
default 2048 if ARCH_SOCFPGA default 2048 if ARCH_INTEL_SOCFPGA
default 1024 if ARCH_BRCMSTB || ARCH_RENESAS || ARCH_TEGRA || \ default 1024 if ARCH_BRCMSTB || ARCH_RENESAS || ARCH_TEGRA || \
ARCH_ZYNQ || ARCH_ASPEED ARCH_ZYNQ || ARCH_ASPEED
default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || \ default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || \

6
arch/arm/Kconfig.debug
View File

@ -1087,7 +1087,7 @@ choice
on SD5203 UART. on SD5203 UART.
config DEBUG_SOCFPGA_UART0 config DEBUG_SOCFPGA_UART0
depends on ARCH_SOCFPGA depends on ARCH_INTEL_SOCFPGA
bool "Use SOCFPGA UART0 for low-level debug" bool "Use SOCFPGA UART0 for low-level debug"
select DEBUG_UART_8250 select DEBUG_UART_8250
help help
@ -1095,7 +1095,7 @@ choice
on SOCFPGA(Cyclone 5 and Arria 5) based platforms. on SOCFPGA(Cyclone 5 and Arria 5) based platforms.
config DEBUG_SOCFPGA_ARRIA10_UART1 config DEBUG_SOCFPGA_ARRIA10_UART1
depends on ARCH_SOCFPGA depends on ARCH_INTEL_SOCFPGA
bool "Use SOCFPGA Arria10 UART1 for low-level debug" bool "Use SOCFPGA Arria10 UART1 for low-level debug"
select DEBUG_UART_8250 select DEBUG_UART_8250
help help
@ -1103,7 +1103,7 @@ choice
on SOCFPGA(Arria 10) based platforms. on SOCFPGA(Arria 10) based platforms.
config DEBUG_SOCFPGA_CYCLONE5_UART1 config DEBUG_SOCFPGA_CYCLONE5_UART1
depends on ARCH_SOCFPGA depends on ARCH_INTEL_SOCFPGA
bool "Use SOCFPGA Cyclone 5 UART1 for low-level debug" bool "Use SOCFPGA Cyclone 5 UART1 for low-level debug"
select DEBUG_UART_8250 select DEBUG_UART_8250
help help

2
arch/arm/Makefile
View File

@ -209,7 +209,7 @@ machine-$(CONFIG_PLAT_SAMSUNG) += s3c
machine-$(CONFIG_ARCH_S5PV210) += s5pv210 machine-$(CONFIG_ARCH_S5PV210) += s5pv210
machine-$(CONFIG_ARCH_SA1100) += sa1100 machine-$(CONFIG_ARCH_SA1100) += sa1100
machine-$(CONFIG_ARCH_RENESAS) += shmobile machine-$(CONFIG_ARCH_RENESAS) += shmobile
machine-$(CONFIG_ARCH_SOCFPGA) += socfpga machine-$(CONFIG_ARCH_INTEL_SOCFPGA) += socfpga
machine-$(CONFIG_ARCH_STI) += sti machine-$(CONFIG_ARCH_STI) += sti
machine-$(CONFIG_ARCH_STM32) += stm32 machine-$(CONFIG_ARCH_STM32) += stm32
machine-$(CONFIG_ARCH_SUNXI) += sunxi machine-$(CONFIG_ARCH_SUNXI) += sunxi

2
arch/arm/boot/dts/Makefile
View File

@ -1033,7 +1033,7 @@ dtb-$(CONFIG_ARCH_S5PV210) += \
s5pv210-smdkc110.dtb \ s5pv210-smdkc110.dtb \
s5pv210-smdkv210.dtb \ s5pv210-smdkv210.dtb \
s5pv210-torbreck.dtb s5pv210-torbreck.dtb
dtb-$(CONFIG_ARCH_SOCFPGA) += \ dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += \
socfpga_arria5_socdk.dtb \ socfpga_arria5_socdk.dtb \
socfpga_arria10_socdk_nand.dtb \ socfpga_arria10_socdk_nand.dtb \
socfpga_arria10_socdk_qspi.dtb \ socfpga_arria10_socdk_qspi.dtb \

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

@ -2,6 +2,7 @@
menuconfig ARCH_SOCFPGA menuconfig ARCH_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,6 +21,9 @@ menuconfig ARCH_SOCFPGA
select PL310_ERRATA_769419 select PL310_ERRATA_769419
if ARCH_SOCFPGA if ARCH_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

4
arch/arm64/Kconfig.platforms
View File

@ -256,9 +256,13 @@ config ARCH_SEATTLE
config ARCH_STRATIX10 config ARCH_STRATIX10
bool "Altera's Stratix 10 SoCFPGA Family" bool "Altera's Stratix 10 SoCFPGA Family"
select ARCH_INTEL_SOCFPGA
help help
This enables support for Altera's Stratix 10 SoCFPGA Family. This enables support for Altera's Stratix 10 SoCFPGA Family.
config ARCH_INTEL_SOCFPGA
bool
config ARCH_SYNQUACER config ARCH_SYNQUACER
bool "Socionext SynQuacer SoC Family" bool "Socionext SynQuacer SoC Family"

2
arch/arm64/boot/dts/altera/Makefile
View File

@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
dtb-$(CONFIG_ARCH_STRATIX10) += socfpga_stratix10_socdk.dtb \ dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += socfpga_stratix10_socdk.dtb \
socfpga_stratix10_socdk_nand.dtb socfpga_stratix10_socdk_nand.dtb