vexpress64: kconfig: consolidate CONFIG_TARGET_VEXPRESS_AEMV8A_SEMI

[karo-tx-uboot.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 8f5f4237957c1d3d29fd6c874943f1cb62aa0e26..88c7eaa8612d73d743bf64fdc70488af5c226bf8 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -2,7 +2,6 @@ menu "ARM architecture"
        depends on ARM
 
 config SYS_ARCH
-       string
        default "arm"
 
 choice
@@ -190,8 +189,8 @@ config TARGET_SANSA_FUZE_PLUS
 config TARGET_SC_SPS_1
        bool "Support sc_sps_1"
 
-config TARGET_NHK8815
-       bool "Support nhk8815"
+config ARCH_NOMADIK
+       bool "ST-Ericsson Nomadik"
 
 config ORION5X
        bool "Marvell Orion"
@@ -409,6 +408,9 @@ config TARGET_GW_VENTANA
 config TARGET_HUMMINGBOARD
        bool "Support hummingboard"
 
+config TARGET_TQMA6
+       bool "TQ Systems TQMa6 board"
+
 config OMAP34XX
        bool "OMAP34XX SoC"
 
@@ -458,15 +460,18 @@ config TEGRA
 config TARGET_VEXPRESS_AEMV8A
        bool "Support vexpress_aemv8a"
 
-config TARGET_VEXPRESS_AEMV8A_SEMI
-       bool "Support vexpress_aemv8a_semi"
-
 config TARGET_LS2085A_EMU
        bool "Support ls2085a_emu"
 
 config TARGET_LS2085A_SIMU
        bool "Support ls2085a_simu"
 
+config TARGET_LS1021AQDS
+       bool "Support ls1021aqds_nor"
+
+config TARGET_LS1021ATWR
+       bool "Support ls1021atwr_nor"
+
 config TARGET_BALLOON3
        bool "Support balloon3"
 
@@ -518,6 +523,8 @@ source "arch/arm/cpu/armv7/keystone/Kconfig"
 
 source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig"
 
+source "arch/arm/cpu/arm926ejs/nomadik/Kconfig"
+
 source "arch/arm/cpu/armv7/omap3/Kconfig"
 
 source "arch/arm/cpu/armv7/omap4/Kconfig"
@@ -589,6 +596,8 @@ source "board/eukrea/cpu9260/Kconfig"
 source "board/eukrea/cpuat91/Kconfig"
 source "board/faraday/a320evb/Kconfig"
 source "board/freescale/ls2085a/Kconfig"
+source "board/freescale/ls1021aqds/Kconfig"
+source "board/freescale/ls1021atwr/Kconfig"
 source "board/freescale/mx23evk/Kconfig"
 source "board/freescale/mx25pdk/Kconfig"
 source "board/freescale/mx28evk/Kconfig"
@@ -650,7 +659,6 @@ source "board/spear/spear600/Kconfig"
 source "board/spear/x600/Kconfig"
 source "board/st-ericsson/snowball/Kconfig"
 source "board/st-ericsson/u8500/Kconfig"
-source "board/st/nhk8815/Kconfig"
 source "board/sunxi/Kconfig"
 source "board/syteco/jadecpu/Kconfig"
 source "board/syteco/zmx25/Kconfig"
@@ -662,6 +670,7 @@ source "board/ti/ti816x/Kconfig"
 source "board/ti/tnetv107xevm/Kconfig"
 source "board/timll/devkit3250/Kconfig"
 source "board/toradex/colibri_pxa270/Kconfig"
+source "board/tqc/tqma6/Kconfig"
 source "board/trizepsiv/Kconfig"
 source "board/ttcontrol/vision2/Kconfig"
 source "board/udoo/Kconfig"