kconfig: arm: remove duplicate definitions of SOC_MX*

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index df3207fdaaaae75248ddcf6e218ac384ec402fc9..2c000f502bdc303f2acf438888dbc514a92d8320 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -91,54 +91,6 @@ config SOC_AM335X
        select CPU_V7
        select OMAP_COMMON
 
        select CPU_V7
        select OMAP_COMMON
 

-config SOC_MXS
-       bool
-       select CPU_ARM926EJS
-
-config SOC_MX23
-       bool
-       select SOC_MXS
-
-config SOC_MX28
-       bool
-       select SOC_MXS
-
-config SOC_MX5
-       bool
-       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
-       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
-       bool
-       select SOC_MX6
-

 config SOC_SAMA5D4
        bool
        select CPU_V7
 config SOC_SAMA5D4
        bool
        select CPU_V7


@@ -677,7 +629,7 @@ config TARGET_MX6SXSABRESD
 
 config TARGET_MX6UL_14X14_EVK
        bool "Support mx6ul_14x14_evk"
 
 config TARGET_MX6UL_14X14_EVK
        bool "Support mx6ul_14x14_evk"

-       select CPU_V7
+       select SOC_MX6UL

        select DM
        select DM_THERMAL
        select SUPPORT_SPL
        select DM
        select DM_THERMAL
        select SUPPORT_SPL

diff --git a/arch/arm/cpu/armv7/mx5/Kconfig b/arch/arm/cpu/armv7/mx5/Kconfig
index ca3c6556d042fa508102d0692d730fd1fde56b14..ce7c1f5a1f0b080c282ed42e80c1cdd8200cb674 100644 (file)
--- a/arch/arm/cpu/armv7/mx5/Kconfig
+++ b/arch/arm/cpu/armv7/mx5/Kconfig
@@ -1,9 +1,5 @@
 if ARCH_MX5
 
 if ARCH_MX5
 

-config SOC_MX5
-       bool
-       default y
-

 config SOC_MX51
        bool
 
 config SOC_MX51
        bool
 

diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
index 078b5a968601f7ef56912459177df75e0367ffaf..bd8bbd0c3cbc73bac9bd7978e9644049f4212fe4 100644 (file)
--- a/arch/arm/cpu/armv7/mx6/Kconfig
+++ b/arch/arm/cpu/armv7/mx6/Kconfig
@@ -1,9 +1,5 @@
 if ARCH_MX6
 
 if ARCH_MX6
 

-config SOC_MX6
-       bool
-       default y
-

 config SOC_MX6D
        bool
 
 config SOC_MX6D
        bool