Commit 910499e1 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Dinh Nguyen
Browse files

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

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1320,7 +1320,7 @@ config ARM_PSCI 
# selected platforms.

config ARCH_NR_GPIO

	int

	default 2048 if ARCH_SOCFPGA

	default 2048 if ARCH_INTEL_SOCFPGA

	default 1024 if ARCH_BRCMSTB || ARCH_RENESAS || ARCH_TEGRA || \

		ARCH_ZYNQ || ARCH_ASPEED

	default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || \

arch/arm/Kconfig.debug

+3 −3
Original line number Diff line number Diff line
@@ -1087,7 +1087,7 @@ choice 
		  on SD5203 UART.



	config DEBUG_SOCFPGA_UART0

		depends on ARCH_SOCFPGA

		depends on ARCH_INTEL_SOCFPGA

		bool "Use SOCFPGA UART0 for low-level debug"

		select DEBUG_UART_8250

		help
@@ -1095,7 +1095,7 @@ choice 
		  on SOCFPGA(Cyclone 5 and Arria 5) based platforms.



	config DEBUG_SOCFPGA_ARRIA10_UART1

		depends on ARCH_SOCFPGA

		depends on ARCH_INTEL_SOCFPGA

		bool "Use SOCFPGA Arria10 UART1 for low-level debug"

		select DEBUG_UART_8250

		help
@@ -1103,7 +1103,7 @@ choice 
		  on SOCFPGA(Arria 10) based platforms.



	config DEBUG_SOCFPGA_CYCLONE5_UART1

		depends on ARCH_SOCFPGA

		depends on ARCH_INTEL_SOCFPGA

		bool "Use SOCFPGA Cyclone 5 UART1 for low-level debug"

		select DEBUG_UART_8250

		help

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ machine-$(CONFIG_PLAT_SAMSUNG) += s3c 
machine-$(CONFIG_ARCH_S5PV210)		+= s5pv210

machine-$(CONFIG_ARCH_SA1100)		+= sa1100

machine-$(CONFIG_ARCH_RENESAS)	 	+= shmobile

machine-$(CONFIG_ARCH_SOCFPGA)		+= socfpga

machine-$(CONFIG_ARCH_INTEL_SOCFPGA)	+= socfpga

machine-$(CONFIG_ARCH_STI)		+= sti

machine-$(CONFIG_ARCH_STM32)		+= stm32

machine-$(CONFIG_ARCH_SUNXI)		+= sunxi

arch/arm/boot/dts/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1033,7 +1033,7 @@ dtb-$(CONFIG_ARCH_S5PV210) += \ 
	s5pv210-smdkc110.dtb \

	s5pv210-smdkv210.dtb \

	s5pv210-torbreck.dtb

dtb-$(CONFIG_ARCH_SOCFPGA) += \

dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += \

	socfpga_arria5_socdk.dtb \

	socfpga_arria10_socdk_nand.dtb \

	socfpga_arria10_socdk_qspi.dtb \

arch/arm/mach-socfpga/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
menuconfig ARCH_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,6 +21,9 @@ menuconfig ARCH_SOCFPGA 
	select PL310_ERRATA_769419



if ARCH_SOCFPGA

config ARCH_INTEL_SOCFPGA

	bool



config SOCFPGA_SUSPEND

	bool "Suspend to RAM on SOCFPGA"

	help