summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-04-21 20:38:20 +0900
committerMarek Vasut <marex@denx.de>2015-05-07 05:21:08 +0200
commit7865f4b0b67ea7108117e68166294b7e95a5ede1 (patch)
treec78f8be1ab5f0b92bba50dc8a4afcfc3ea578bcc /arch/arm/Kconfig
parenta02a669c111e16b9be26c176b874a1a622f12aba (diff)
downloadtalos-obmc-uboot-7865f4b0b67ea7108117e68166294b7e95a5ede1.tar.gz
talos-obmc-uboot-7865f4b0b67ea7108117e68166294b7e95a5ede1.zip
ARM: socfpga: move board select into mach-socfpga/Kconfig
Switch to a more standard way of board select; put the SoC select into arch/arm/Kconfig and move the board select menu under arch/arm/mach-socfpga/Kconfig. Also, consolidate SYS_BOARD, SYS_VENDOR, SYS_SOC, SYS_CONFIG_NAME. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig15
1 files changed, 4 insertions, 11 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 49bcad1d13..cee31265ab 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -619,16 +619,8 @@ config TARGET_CM_FX6
select DM_SERIAL
select DM_GPIO
-config TARGET_SOCFPGA_ARRIA5
- bool "Support socfpga_arria5"
- select CPU_V7
- select SUPPORT_SPL
- select DM
- select DM_SPI_FLASH
- select DM_SPI
-
-config TARGET_SOCFPGA_CYCLONE5
- bool "Support socfpga_cyclone5"
+config ARCH_SOCFPGA
+ bool "Altera SOCFPGA family"
select CPU_V7
select SUPPORT_SPL
select DM
@@ -841,6 +833,8 @@ source "arch/arm/cpu/armv7/rmobile/Kconfig"
source "arch/arm/cpu/armv7/s5pc1xx/Kconfig"
+source "arch/arm/mach-socfpga/Kconfig"
+
source "arch/arm/mach-tegra/Kconfig"
source "arch/arm/mach-uniphier/Kconfig"
@@ -863,7 +857,6 @@ source "board/Marvell/aspenite/Kconfig"
source "board/Marvell/db-88f6820-gp/Kconfig"
source "board/Marvell/db-mv784mp-gp/Kconfig"
source "board/Marvell/gplugd/Kconfig"
-source "board/altera/socfpga/Kconfig"
source "board/armadeus/apf27/Kconfig"
source "board/armltd/vexpress/Kconfig"
source "board/armltd/vexpress64/Kconfig"
OpenPOWER on IntegriCloud