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 67982f5dba793ded2002262c719cb5b083bdef0b..2c000f502bdc303f2acf438888dbc514a92d8320 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -65,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
@@ -217,7 +190,6 @@ config TARGET_TX53
 
 config TARGET_TX6
        bool "Support tx6"
-       select SOC_MX6
 
 config TARGET_ZMX25
        bool "Support zmx25"
@@ -548,14 +520,6 @@ config ARCH_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
@@ -665,7 +629,7 @@ config TARGET_MX6SXSABRESD
 
 config TARGET_MX6UL_14X14_EVK
        bool "Support mx6ul_14x14_evk"
-       select CPU_V7
+       select SOC_MX6UL
        select DM
        select DM_THERMAL
        select SUPPORT_SPL
@@ -929,6 +893,8 @@ source "arch/arm/mach-keystone/Kconfig"
 
 source "arch/arm/mach-kirkwood/Kconfig"
 
+source "arch/arm/cpu/arm926ejs/mxs/Kconfig"
+
 source "arch/arm/cpu/armv7/mx6/Kconfig"
 
 source "arch/arm/cpu/armv7/mx5/Kconfig"