From b21a8dc446db69848aea810385e09020359de1d9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Mon, 12 Oct 2015 14:02:36 +0200 Subject: [PATCH] kconfig: arm: remove duplicate definitions of SOC_MX* --- arch/arm/Kconfig | 50 +--------------------------------- arch/arm/cpu/armv7/mx5/Kconfig | 4 --- arch/arm/cpu/armv7/mx6/Kconfig | 4 --- 3 files changed, 1 insertion(+), 57 deletions(-) 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 -- 2.39.2