From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Mon, 12 Oct 2015 12:02:36 +0000 (+0200)
Subject: kconfig: arm: remove duplicate definitions of SOC_MX*
X-Git-Tag: KARO-TX6UL-2015-10-23~18
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=b21a8dc446db69848aea810385e09020359de1d9

kconfig: arm: remove duplicate definitions of SOC_MX*
---

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index df3207fdaa..2c000f502b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -91,54 +91,6 @@ config SOC_AM335X
 	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
@@ -677,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
diff --git a/arch/arm/cpu/armv7/mx5/Kconfig b/arch/arm/cpu/armv7/mx5/Kconfig
index ca3c6556d0..ce7c1f5a1f 100644
--- a/arch/arm/cpu/armv7/mx5/Kconfig
+++ b/arch/arm/cpu/armv7/mx5/Kconfig
@@ -1,9 +1,5 @@
 if ARCH_MX5
 
-config SOC_MX5
-	bool
-	default y
-
 config SOC_MX51
 	bool
 
diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
index 078b5a9686..bd8bbd0c3c 100644
--- a/arch/arm/cpu/armv7/mx6/Kconfig
+++ b/arch/arm/cpu/armv7/mx6/Kconfig
@@ -1,9 +1,5 @@
 if ARCH_MX6
 
-config SOC_MX6
-	bool
-	default y
-
 config SOC_MX6D
 	bool