1 files changed, 5 insertions, 14 deletions

diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig
index b4e7c58bbb3..fb4c503bb05 100644
--- a/arch/arm/mach-mx5/Kconfig
+++ b/arch/arm/mach-mx5/Kconfig
@@ -1,8 +1,9 @@
-if ARCH_MX503 || ARCH_MX51
+if ARCH_MX5
+
 # ARCH_MX5/50/53 are left to mark places where prevent multi-soc in single
 # image. So for most time, SOC_IMX50/51/53 should be used.
 
-config ARCH_MX5
+config ARCH_MX51
         bool
 
 config ARCH_MX50
@@ -19,7 +20,6 @@ config SOC_IMX50
         select ARCH_MXC_IOMUX_V3
         select ARCH_MXC_AUDMUX_V2
         select ARCH_HAS_CPUFREQ
-        select ARCH_MX5
         select ARCH_MX50
 
 config  SOC_IMX51
@@ -30,7 +30,7 @@ config	SOC_IMX51
         select ARCH_MXC_IOMUX_V3
         select ARCH_MXC_AUDMUX_V2
         select ARCH_HAS_CPUFREQ
-        select ARCH_MX5
+        select ARCH_MX51
 
 config  SOC_IMX53
         bool
@@ -38,10 +38,8 @@ config	SOC_IMX53
         select ARM_L1_CACHE_SHIFT_6
         select MXC_TZIC
         select ARCH_MXC_IOMUX_V3
-        select ARCH_MX5
         select ARCH_MX53
 
-if ARCH_MX50_SUPPORTED
 #comment "i.MX50 machines:"
 
 config MACH_MX50_RDP
@@ -57,9 +55,6 @@ config MACH_MX50_RDP
           Include support for MX50 reference design platform (RDP) board. This
           includes specific configurations for the board and its peripherals.
 
-endif # ARCH_MX50_SUPPORTED
-
-if ARCH_MX51
 comment "i.MX51 machines:"
 
 config MACH_MX51_BABBAGE
@@ -147,6 +142,7 @@ config MX51_EFIKA_COMMON
         bool
         select SOC_IMX51
         select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_PATA_IMX
         select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
         select IMX_HAVE_PLATFORM_SPI_IMX
         select MXC_ULPI if USB_ULPI
@@ -167,9 +163,6 @@ config MACH_MX51_EFIKASB
           Include support for Genesi Efika Smartbook. This includes specific
           configurations for the board and its peripherals.
 
-endif # ARCH_MX51
-
-if ARCH_MX53_SUPPORTED
 comment "i.MX53 machines:"
 
 config MACH_MX53_EVK
@@ -221,6 +214,4 @@ config MACH_MX53_ARD
           Include support for MX53 ARD platform. This includes specific
           configurations for the board and its peripherals.
 
-endif # ARCH_MX53_SUPPORTED
-
 endif