arm: mx6: cm-fx6: move cm-fx6 target under ARCH_MX6

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5b8ebad130655408e9387da89d1f872128dea2be..0421bc8fec796a6fdf380282cc20aba89ce1c367 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -121,6 +121,7 @@ config SOC_SAMA5D4
 
 choice
        prompt "Target select"
+       optional
 
 config ARCH_AT91
        bool "Atmel AT91"
@@ -159,6 +160,11 @@ config KIRKWOOD
        bool "Marvell Kirkwood"
        select CPU_ARM926EJS
 
+config TARGET_DB_88F6820_GP
+       bool "Support DB-88F6820-GP"
+       select CPU_V7
+       select SUPPORT_SPL
+
 config TARGET_DB_MV784MP_GP
        bool "Support db-mv784mp-gp"
        select CPU_V7
@@ -304,6 +310,9 @@ config TARGET_STV0991
        select CPU_V7
        select DM
        select DM_SERIAL
+       select DM_SPI
+       select DM_SPI_FLASH
+       select SPI_FLASH
 
 config TARGET_X600
        bool "Support x600"
@@ -423,8 +432,13 @@ config TARGET_DRACO
        select CPU_V7
        select SUPPORT_SPL
 
-config TARGET_DXR2
-       bool "Support dxr2"
+config TARGET_THUBAN
+       bool "Support thuban"
+       select CPU_V7
+       select SUPPORT_SPL
+
+config TARGET_RASTABAN
+       bool "Support rastaban"
        select CPU_V7
        select SUPPORT_SPL
 
@@ -446,6 +460,14 @@ config TARGET_PENGWYN
        select DM_SERIAL
        select DM_GPIO
 
+config TARGET_AM335X_BALTOS
+       bool "Support am335x_baltos"
+       select CPU_V7
+       select SUPPORT_SPL
+       select DM
+       select DM_SERIAL
+       select DM_GPIO
+
 config TARGET_AM335X_EVM
        bool "Support am335x_evm"
        select CPU_V7
@@ -576,6 +598,7 @@ config TARGET_UDOO
 config TARGET_WANDBOARD
        bool "Support wandboard"
        select CPU_V7
+       select SUPPORT_SPL
 
 config TARGET_WARP
        bool "Support WaRP"
@@ -601,6 +624,10 @@ config TARGET_ARISTAINETOS
        bool "Support aristainetos"
        select CPU_V7
 
+config TARGET_ARISTAINETOS2
+       bool "Support aristainetos2"
+       select CPU_V7
+
 config TARGET_MX6QARM2
        bool "Support mx6qarm2"
        select CPU_V7
@@ -618,6 +645,11 @@ config TARGET_MX6SABRESD
        select DM
        select DM_THERMAL
 
+config TARGET_MX6CUBOXI
+       bool "Support Solid-run mx6 boards"
+       select CPU_V7
+       select SUPPORT_SPL
+
 config TARGET_MX6SLEVK
        bool "Support mx6slevk"
        select CPU_V7
@@ -634,10 +666,6 @@ config TARGET_GW_VENTANA
        select CPU_V7
        select SUPPORT_SPL
 
-config TARGET_HUMMINGBOARD
-       bool "Support hummingboard"
-       select CPU_V7
-
 config TARGET_KOSAGI_NOVENA
        bool "Support Kosagi Novena"
        select CPU_V7
@@ -647,10 +675,6 @@ config TARGET_TBS2910
        bool "Support tbs2910"
        select CPU_V7
 
-config TARGET_TQMA6
-       bool "TQ Systems TQMa6 board"
-       select CPU_V7
-
 config TARGET_OT1200
        bool "Bachmann OT1200"
        select CPU_V7
@@ -684,21 +708,8 @@ config RMOBILE
        bool "Renesas ARM SoCs"
        select CPU_V7
 
-config TARGET_CM_FX6
-       bool "Support cm_fx6"
-       select CPU_V7
-       select SUPPORT_SPL
-
-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
@@ -707,6 +718,17 @@ config TARGET_SOCFPGA_CYCLONE5
 
 config ARCH_SUNXI
        bool "Support sunxi (Allwinner) SoCs"
+       select CMD_USB
+       select DM
+       select DM_GPIO
+       select DM_ETH
+       select DM_SERIAL
+       select DM_USB
+       select OF_CONTROL
+       select OF_SEPARATE
+       select SPL_DISABLE_OF_CONTROL
+       select USB
+       select USB_STORAGE
 
 config TARGET_SNOWBALL
        bool "Support snowball"
@@ -720,28 +742,26 @@ config TARGET_VF610TWR
        bool "Support vf610twr"
        select CPU_V7
 
-config ZYNQ
+config TARGET_COLIBRI_VF
+       bool "Support Colibri VF50/61"
+       select CPU_V7
+
+config ARCH_ZYNQ
        bool "Xilinx Zynq Platform"
        select CPU_V7
        select SUPPORT_SPL
+       select OF_CONTROL
+       select SPL_DISABLE_OF_CONTROL
        select DM
+       select DM_SPI
+       select DM_SPI_FLASH
 
-config TARGET_XILINX_ZYNQMP
+config ARCH_ZYNQMP
        bool "Support Xilinx ZynqMP Platform"
        select ARM64
 
 config TEGRA
        bool "NVIDIA Tegra"
-       select SUPPORT_SPL
-       select SPL
-       select OF_CONTROL
-       select CPU_V7
-       select DM
-       select DM_SPI_FLASH
-       select DM_SERIAL
-       select DM_I2C
-       select DM_SPI
-       select DM_GPIO
 
 config TARGET_VEXPRESS64_AEMV8A
        bool "Support vexpress_aemv8a"
@@ -853,7 +873,7 @@ config TARGET_JORNADA
        select CPU_SA1100
 
 config ARCH_UNIPHIER
-       bool "Panasonic UniPhier platform"
+       bool "Socionext UniPhier SoCs"
        select CPU_V7
        select SUPPORT_SPL
        select SPL
@@ -861,6 +881,10 @@ config ARCH_UNIPHIER
        select DM
        select DM_SERIAL
        select DM_I2C
+       select SPL_DISABLE_OF_CONTROL
+       help
+         Support for UniPhier SoC family developed by Socionext Inc.
+         (formerly, System LSI Business Division of Panasonic Corporation)
 
 config TARGET_STM32F429_DISCOVERY
        bool "Support STM32F429 Discovery"
@@ -902,6 +926,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"
@@ -912,6 +938,8 @@ source "arch/arm/mach-zynq/Kconfig"
 
 source "arch/arm/cpu/armv7/Kconfig"
 
+source "arch/arm/cpu/armv8/zynqmp/Kconfig"
+
 source "arch/arm/cpu/armv8/Kconfig"
 
 source "arch/arm/imx-common/Kconfig"
@@ -921,9 +949,9 @@ source "board/BuR/kwb/Kconfig"
 source "board/BuR/tseries/Kconfig"
 source "board/CarMediaLab/flea3/Kconfig"
 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"
@@ -1004,7 +1032,7 @@ source "board/siemens/draco/Kconfig"
 source "board/siemens/pxm2/Kconfig"
 source "board/siemens/rut/Kconfig"
 source "board/silica/pengwyn/Kconfig"
-source "board/solidrun/hummingboard/Kconfig"
+source "board/solidrun/mx6cuboxi/Kconfig"
 source "board/spear/spear300/Kconfig"
 source "board/spear/spear310/Kconfig"
 source "board/spear/spear320/Kconfig"
@@ -1024,17 +1052,17 @@ source "board/ti/ti814x/Kconfig"
 source "board/ti/ti816x/Kconfig"
 source "board/timll/devkit3250/Kconfig"
 source "board/toradex/colibri_pxa270/Kconfig"
-source "board/tqc/tqma6/Kconfig"
+source "board/toradex/colibri_vf/Kconfig"
 source "board/trizepsiv/Kconfig"
 source "board/ttcontrol/vision2/Kconfig"
 source "board/udoo/Kconfig"
 source "board/vpac270/Kconfig"
+source "board/vscom/baltos/Kconfig"
 source "board/wandboard/Kconfig"
 source "board/warp/Kconfig"
 source "board/woodburn/Kconfig"
 source "board/work-microwave/work_92105/Kconfig"
 source "board/xaeniax/Kconfig"
-source "board/xilinx/zynqmp/Kconfig"
 source "board/zipitz2/Kconfig"
 
 source "arch/arm/Kconfig.debug"