kconfig: arm: remove duplicate definitions of SOC_MX*

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0421bc8fec796a6fdf380282cc20aba89ce1c367..2c000f502bdc303f2acf438888dbc514a92d8320 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -42,6 +42,9 @@ config CPU_PXA
 config CPU_SA1100
         bool
 
+config OMAP_COMMON
+       bool
+
 config SYS_CPU
         default "arm720t" if CPU_ARM720T
         default "arm920t" if CPU_ARM920T
@@ -62,58 +65,31 @@ config SEMIHOSTING
          the hosted environment to call out to the emulator to
          retrieve files from the host machine.
 
-config SOC_AM335X
-       bool
-       select CPU_V7
-       select OMAP_COMMON
+config SYS_ICACHE_OFF
+       bool "Do not use Instruction Cache"
 
-config SOC_MXS
-       bool
-       select CPU_ARM926EJS
+config SYS_DCACHE_OFF
+       bool "Do not use Data Cache"
 
-config SOC_MX23
-       bool
-       select SOC_MXS
+config SYS_L2CACHE_OFF
+       bool "Do not use L2 cache"
 
-config SOC_MX28
-       bool
-       select SOC_MXS
+config ARCH_MXS
+       bool "Freescale i.MX23 & i.MX28"
+       select CPU_ARM926EJS
 
-config SOC_MX5
-       bool
+config ARCH_MX6
+       bool "Freescale MX6"
        select CPU_V7
 
-config SOC_MX53
-       bool
-       select SOC_MX5
-
-config SOC_MX51
-       bool
-       select SOC_MX5
-
-config SOC_MX53
-       bool
-       select SOC_MX5
-
-config SOC_MX6
-       bool
+config ARCH_MX5
+       bool "Freescale MX5"
        select CPU_V7
 
-config SOC_MX6Q
-       bool
-       select SOC_MX6
-
-config SOC_MX6DL
-       bool
-       select SOC_MX6
-
-config SOC_MX6S
-       bool
-       select SOC_MX6
-
-config SOC_MX6SX
+config SOC_AM335X
        bool
-       select SOC_MX6
+       select CPU_V7
+       select OMAP_COMMON
 
 config SOC_SAMA5D4
        bool
@@ -121,7 +97,7 @@ config SOC_SAMA5D4
 
 choice
        prompt "Target select"
-       optional
+       default ARCH_VERSATILE
 
 config ARCH_AT91
        bool "Atmel AT91"
@@ -178,6 +154,7 @@ config TARGET_MAXBCM
 config TARGET_DEVKIT3250
        bool "Support devkit3250"
        select CPU_ARM926EJS
+       select SUPPORT_SPL
 
 config TARGET_WORK_92105
        bool "Support work_92105"
@@ -213,11 +190,6 @@ config TARGET_TX53
 
 config TARGET_TX6
        bool "Support tx6"
-       select SOC_MX6
-
-config TARGET_TXA5
-       bool "Support txA5"
-       select SOC_SAMA5D4
 
 config TARGET_ZMX25
        bool "Support zmx25"
@@ -540,20 +512,14 @@ config ARCH_HIGHBANK
 
 config ARCH_INTEGRATOR
        bool "ARM Ltd. Integrator family"
+       select DM
+       select DM_SERIAL
 
 config ARCH_KEYSTONE
        bool "TI Keystone"
        select CPU_V7
        select SUPPORT_SPL
 
-config ARCH_MX6
-       bool "Freescale MX6"
-       select CPU_V7
-
-config ARCH_MX5
-       bool "Freescale MX5"
-       select CPU_V7
-
 config TARGET_M53EVK
        bool "Support m53evk"
        select CPU_V7
@@ -661,6 +627,13 @@ config TARGET_MX6SXSABRESD
        select DM
        select DM_THERMAL
 
+config TARGET_MX6UL_14X14_EVK
+       bool "Support mx6ul_14x14_evk"
+       select SOC_MX6UL
+       select DM
+       select DM_THERMAL
+       select SUPPORT_SPL
+
 config TARGET_GW_VENTANA
        bool "Support gw_ventana"
        select CPU_V7
@@ -716,6 +689,11 @@ config ARCH_SOCFPGA
        select DM_SPI_FLASH
        select DM_SPI
 
+config TARGET_CM_T43
+       bool "Support cm_t43"
+       select CPU_V7
+       select SUPPORT_SPL
+
 config ARCH_SUNXI
        bool "Support sunxi (Allwinner) SoCs"
        select CMD_USB
@@ -726,9 +704,9 @@ config ARCH_SUNXI
        select DM_USB
        select OF_CONTROL
        select OF_SEPARATE
-       select SPL_DISABLE_OF_CONTROL
        select USB
        select USB_STORAGE
+       select USB_KEYBOARD
 
 config TARGET_SNOWBALL
        bool "Support snowball"
@@ -751,7 +729,6 @@ config ARCH_ZYNQ
        select CPU_V7
        select SUPPORT_SPL
        select OF_CONTROL
-       select SPL_DISABLE_OF_CONTROL
        select DM
        select DM_SPI
        select DM_SPI_FLASH
@@ -808,6 +785,13 @@ config TARGET_LS2085ARDB
          development platform that supports the QorIQ LS2085A
          Layerscape Architecture processor.
 
+config TARGET_HIKEY
+       bool "Support HiKey 96boards Consumer Edition Platform"
+       select ARM64
+         help
+         Support for HiKey 96boards platform. It features a HI6220
+         SoC, with 8xA53 CPU, mali450 gpu, and 1GB RAM.
+
 config TARGET_LS1021AQDS
        bool "Support ls1021aqds"
        select CPU_V7
@@ -878,10 +862,11 @@ config ARCH_UNIPHIER
        select SUPPORT_SPL
        select SPL
        select OF_CONTROL
+       select SPL_OF_CONTROL
        select DM
+       select SPL_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)
@@ -898,7 +883,7 @@ source "arch/arm/mach-bcm283x/Kconfig"
 
 source "arch/arm/mach-davinci/Kconfig"
 
-source "arch/arm/cpu/armv7/exynos/Kconfig"
+source "arch/arm/mach-exynos/Kconfig"
 
 source "arch/arm/mach-highbank/Kconfig"
 
@@ -908,11 +893,13 @@ source "arch/arm/mach-keystone/Kconfig"
 
 source "arch/arm/mach-kirkwood/Kconfig"
 
-source "arch/arm/mach-nomadik/Kconfig"
+source "arch/arm/cpu/arm926ejs/mxs/Kconfig"
+
+source "arch/arm/cpu/armv7/mx6/Kconfig"
 
 source "arch/arm/cpu/armv7/mx5/Kconfig"
 
-source "arch/arm/cpu/armv7/mx6/Kconfig"
+source "arch/arm/mach-nomadik/Kconfig"
 
 source "arch/arm/cpu/armv7/omap3/Kconfig"
 
@@ -955,6 +942,7 @@ source "board/Marvell/gplugd/Kconfig"
 source "board/armadeus/apf27/Kconfig"
 source "board/armltd/vexpress/Kconfig"
 source "board/armltd/vexpress64/Kconfig"
+source "board/hisilicon/hikey/Kconfig"
 source "board/bachmann/ot1200/Kconfig"
 source "board/balloon3/Kconfig"
 source "board/barco/platinum/Kconfig"
@@ -966,6 +954,7 @@ source "board/broadcom/bcmcygnus/Kconfig"
 source "board/broadcom/bcmnsp/Kconfig"
 source "board/cirrus/edb93xx/Kconfig"
 source "board/compulab/cm_t335/Kconfig"
+source "board/compulab/cm_t43/Kconfig"
 source "board/compulab/cm_fx6/Kconfig"
 source "board/congatec/cgtqmx6eval/Kconfig"
 source "board/creative/xfi3/Kconfig"
@@ -995,6 +984,7 @@ source "board/freescale/mx6qsabreauto/Kconfig"
 source "board/freescale/mx6sabresd/Kconfig"
 source "board/freescale/mx6slevk/Kconfig"
 source "board/freescale/mx6sxsabresd/Kconfig"
+source "board/freescale/mx6ul_14x14_evk/Kconfig"
 source "board/freescale/vf610twr/Kconfig"
 source "board/gateworks/gw_ventana/Kconfig"
 source "board/genesi/mx51_efikamx/Kconfig"