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 6984134b31b816328b44a4bb35788ae32da07776..0421bc8fec796a6fdf380282cc20aba89ce1c367 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -33,6 +33,9 @@ config CPU_V7
         bool
         select HAS_VBAR
 
+config CPU_V7M
+       bool
+
 config CPU_PXA
         bool
 
@@ -47,6 +50,7 @@ config SYS_CPU
         default "arm1136" if CPU_ARM1136
         default "arm1176" if CPU_ARM1176
         default "armv7" if CPU_V7
+        default "armv7m" if CPU_V7M
         default "pxa" if CPU_PXA
         default "sa1100" if CPU_SA1100
        default "armv8" if ARM64
@@ -117,18 +121,7 @@ config SOC_SAMA5D4
 
 choice
        prompt "Target select"
-
-config TARGET_INTEGRATORAP_CM720T
-       bool "Support integratorap_cm720t"
-       select CPU_ARM720T
-
-config TARGET_INTEGRATORAP_CM920T
-       bool "Support integratorap_cm920t"
-       select CPU_ARM920T
-
-config TARGET_INTEGRATORCP_CM920T
-       bool "Support integratorcp_cm920t"
-       select CPU_ARM920T
+       optional
 
 config ARCH_AT91
        bool "Atmel AT91"
@@ -149,14 +142,6 @@ config TARGET_SMDK2410
        bool "Support smdk2410"
        select CPU_ARM920T
 
-config TARGET_INTEGRATORAP_CM926EJS
-       bool "Support integratorap_cm926ejs"
-       select CPU_ARM926EJS
-
-config TARGET_INTEGRATORCP_CM926EJS
-       bool "Support integratorcp_cm926ejs"
-       select CPU_ARM926EJS
-
 config TARGET_ASPENITE
        bool "Support aspenite"
        select CPU_ARM926EJS
@@ -175,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
@@ -318,6 +308,11 @@ config TARGET_SPEAR600
 config TARGET_STV0991
        bool "Support 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"
@@ -328,10 +323,6 @@ config ARCH_VERSATILE
        bool "ARM Ltd. Versatile family"
        select CPU_ARM926EJS
 
-config TARGET_INTEGRATORCP_CM1136
-       bool "Support integratorcp_cm1136"
-       select CPU_ARM1136
-
 config TARGET_IMX31_PHYCORE
        bool "Support imx31_phycore"
        select CPU_ARM1136
@@ -376,14 +367,9 @@ config TARGET_MX35PDK
 
 config ARCH_BCM283X
        bool "Broadcom BCM283X family"
-
-config TARGET_INTEGRATORAP_CM946ES
-       bool "Support integratorap_cm946es"
-       select CPU_ARM946ES
-
-config TARGET_INTEGRATORCP_CM946ES
-       bool "Support integratorcp_cm946es"
-       select CPU_ARM946ES
+       select DM
+       select DM_SERIAL
+       select DM_GPIO
 
 config TARGET_VEXPRESS_CA15_TC2
        bool "Support vexpress_ca15_tc2"
@@ -413,29 +399,46 @@ config TARGET_CM_T335
        bool "Support cm_t335"
        select CPU_V7
        select SUPPORT_SPL
+       select DM
+       select DM_SERIAL
+       select DM_GPIO
 
 config TARGET_PEPPER
        bool "Support pepper"
        select CPU_V7
        select SUPPORT_SPL
+       select DM
+       select DM_SERIAL
+       select DM_GPIO
 
 config TARGET_AM335X_IGEP0033
        bool "Support am335x_igep0033"
        select CPU_V7
        select SUPPORT_SPL
+       select DM
+       select DM_SERIAL
+       select DM_GPIO
 
 config TARGET_PCM051
        bool "Support pcm051"
        select CPU_V7
        select SUPPORT_SPL
+       select DM
+       select DM_SERIAL
+       select DM_GPIO
 
 config TARGET_DRACO
        bool "Support 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
 
@@ -453,11 +456,25 @@ config TARGET_PENGWYN
        bool "Support pengwyn"
        select CPU_V7
        select SUPPORT_SPL
+       select DM
+       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
        select SUPPORT_SPL
+       select DM
+       select DM_SERIAL
+       select DM_GPIO
 
 config TARGET_AM43XX_EVM
        bool "Support am43xx_evm"
@@ -468,6 +485,8 @@ config TARGET_BAV335X
        bool "Support bav335x"
        select CPU_V7
        select SUPPORT_SPL
+       select DM
+       select DM_SERIAL
        help
          The BAV335x OEM Network Processor integrates all the functions of an
          embedded network computer in a small, easy to use SODIMM module which
@@ -502,15 +521,26 @@ config TARGET_BCMNSP
 config ARCH_EXYNOS
        bool "Samsung EXYNOS"
        select CPU_V7
+       select DM
+       select DM_SPI_FLASH
+       select DM_SERIAL
+       select DM_SPI
+       select DM_GPIO
 
 config ARCH_S5PC1XX
        bool "Samsung S5PC1XX"
        select CPU_V7
+       select DM
+       select DM_SERIAL
+       select DM_GPIO
 
 config ARCH_HIGHBANK
        bool "Calxeda Highbank"
        select CPU_V7
 
+config ARCH_INTEGRATOR
+       bool "ARM Ltd. Integrator family"
+
 config ARCH_KEYSTONE
        bool "TI Keystone"
        select CPU_V7
@@ -568,6 +598,7 @@ config TARGET_UDOO
 config TARGET_WANDBOARD
        bool "Support wandboard"
        select CPU_V7
+       select SUPPORT_SPL
 
 config TARGET_WARP
        bool "Support WaRP"
@@ -593,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
@@ -640,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
@@ -662,44 +693,42 @@ config TARGET_PLATINUM_TITANIUM
 config OMAP34XX
        bool "OMAP34XX SoC"
        select CPU_V7
-       select OMAP_COMMON
 
 config OMAP44XX
        bool "OMAP44XX SoC"
        select CPU_V7
-       select OMAP_COMMON
        select SUPPORT_SPL
 
 config OMAP54XX
        bool "OMAP54XX SoC"
        select CPU_V7
-       select OMAP_COMMON
        select SUPPORT_SPL
 
 config RMOBILE
        bool "Renesas ARM SoCs"
        select CPU_V7
 
-config TARGET_CM_FX6
-       bool "Support cm_fx6"
+config ARCH_SOCFPGA
+       bool "Altera SOCFPGA family"
        select CPU_V7
        select SUPPORT_SPL
        select DM
-       select DM_SERIAL
-       select DM_GPIO
-
-config TARGET_SOCFPGA_ARRIA5
-       bool "Support socfpga_arria5"
-       select CPU_V7
-       select SUPPORT_SPL
-
-config TARGET_SOCFPGA_CYCLONE5
-       bool "Support socfpga_cyclone5"
-       select CPU_V7
-       select SUPPORT_SPL
+       select DM_SPI_FLASH
+       select DM_SPI
 
 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"
@@ -717,21 +746,22 @@ config TARGET_COLIBRI_VF
        bool "Support Colibri VF50/61"
        select CPU_V7
 
-config ZYNQ
+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
 
 config TARGET_VEXPRESS64_AEMV8A
        bool "Support vexpress_aemv8a"
@@ -756,6 +786,28 @@ config TARGET_LS2085A_SIMU
        select ARM64
        select ARMV8_MULTIENTRY
 
+config TARGET_LS2085AQDS
+       bool "Support ls2085aqds"
+       select ARM64
+       select ARMV8_MULTIENTRY
+       select SUPPORT_SPL
+       help
+         Support for Freescale LS2085AQDS platform
+         The LS2085A Development System (QDS) is a high-performance
+         development platform that supports the QorIQ LS2085A
+         Layerscape Architecture processor.
+
+config TARGET_LS2085ARDB
+       bool "Support ls2085ardb"
+       select ARM64
+       select ARMV8_MULTIENTRY
+       select SUPPORT_SPL
+       help
+         Support for Freescale LS2085ARDB platform.
+         The LS2085A Reference design board (RDB) is a high-performance
+         development platform that supports the QorIQ LS2085A
+         Layerscape Architecture processor.
+
 config TARGET_LS1021AQDS
        bool "Support ls1021aqds"
        select CPU_V7
@@ -821,11 +873,22 @@ 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
        select OF_CONTROL
+       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"
+       select CPU_V7M
 
 endchoice
 
@@ -839,15 +902,17 @@ source "arch/arm/cpu/armv7/exynos/Kconfig"
 
 source "arch/arm/mach-highbank/Kconfig"
 
+source "arch/arm/mach-integrator/Kconfig"
+
 source "arch/arm/mach-keystone/Kconfig"
 
 source "arch/arm/mach-kirkwood/Kconfig"
 
-source "arch/arm/cpu/armv7/mx6/Kconfig"
+source "arch/arm/mach-nomadik/Kconfig"
 
 source "arch/arm/cpu/armv7/mx5/Kconfig"
 
-source "arch/arm/mach-nomadik/Kconfig"
+source "arch/arm/cpu/armv7/mx6/Kconfig"
 
 source "arch/arm/cpu/armv7/omap3/Kconfig"
 
@@ -861,16 +926,20 @@ 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"
 
 source "arch/arm/mach-versatile/Kconfig"
 
-source "arch/arm/cpu/armv7/zynq/Kconfig"
+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"
@@ -880,11 +949,10 @@ 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/integrator/Kconfig"
 source "board/armltd/vexpress/Kconfig"
 source "board/armltd/vexpress64/Kconfig"
 source "board/bachmann/ot1200/Kconfig"
@@ -907,6 +975,8 @@ source "board/denx/m53evk/Kconfig"
 source "board/embest/mx6boards/Kconfig"
 source "board/esg/ima3-mx53/Kconfig"
 source "board/freescale/ls2085a/Kconfig"
+source "board/freescale/ls2085aqds/Kconfig"
+source "board/freescale/ls2085ardb/Kconfig"
 source "board/freescale/ls1021aqds/Kconfig"
 source "board/freescale/ls1021atwr/Kconfig"
 source "board/freescale/mx23evk/Kconfig"
@@ -970,6 +1040,7 @@ 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/stm32f429-discovery/Kconfig"
 source "board/st/stv0991/Kconfig"
 source "board/sunxi/Kconfig"
 source "board/syteco/zmx25/Kconfig"
@@ -982,17 +1053,16 @@ source "board/ti/ti816x/Kconfig"
 source "board/timll/devkit3250/Kconfig"
 source "board/toradex/colibri_pxa270/Kconfig"
 source "board/toradex/colibri_vf/Kconfig"
-source "board/tqc/tqma6/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"