2 files changed, 14 insertions, 2 deletions

diff --git a/arch/arm/mach-mx3/Kconfig b/arch/arm/mach-mx3/Kconfig
index 6933d2d0b568..7c939c69d6df 100644
--- a/arch/arm/mach-mx3/Kconfig
+++ b/arch/arm/mach-mx3/Kconfig
@@ -1,9 +1,16 @@
 if ARCH_MX3
 
+config ARCH_MX31
+        bool
+
+config ARCH_MX35
+        bool
+
 comment "MX3 platforms:"
 
 config MACH_MX31ADS
         bool "Support MX31ADS platforms"
+        select ARCH_MX31
         default y
         help
           Include support for MX31ADS platform. This includes specific
@@ -19,13 +26,15 @@ config MACH_MX31ADS_WM1133_EV1
           and audio module for the MX31ADS platform.
 
 config MACH_PCM037
-        bool "Support Phytec pcm037 platforms"
+        bool "Support Phytec pcm037 (i.MX31) platforms"
+        select ARCH_MX31
         help
           Include support for Phytec pcm037 platform. This includes
           specific configurations for the board and its peripherals.
 
 config MACH_MX31LITE
         bool "Support MX31 LITEKIT (LogicPD)"
+        select ARCH_MX31
         default n
         help
           Include support for MX31 LITEKIT platform. This includes specific
@@ -33,6 +42,7 @@ config MACH_MX31LITE
 
 config MACH_MX31_3DS
         bool "Support MX31PDK (3DS)"
+        select ARCH_MX31
         default n
         help
           Include support for MX31PDK (3DS) platform. This includes specific
@@ -40,6 +50,7 @@ config MACH_MX31_3DS
 
 config MACH_MX31MOBOARD
         bool "Support mx31moboard platforms (EPFL Mobots group)"
+        select ARCH_MX31
         default n
         help
           Include support for mx31moboard platform. This includes specific
diff --git a/arch/arm/mach-mx3/Makefile b/arch/arm/mach-mx3/Makefile
index d50d9878a654..68c4837cce6a 100644
--- a/arch/arm/mach-mx3/Makefile
+++ b/arch/arm/mach-mx3/Makefile
@@ -4,7 +4,8 @@
 
 # Object file lists.
 
-obj-y                   := mm.o clock.o devices.o iomux.o
+obj-y                           := mm.o devices.o
+obj-$(CONFIG_ARCH_MX31)         += clock.o iomux.o
 obj-$(CONFIG_MACH_MX31ADS)      += mx31ads.o
 obj-$(CONFIG_MACH_MX31LITE)     += mx31lite.o
 obj-$(CONFIG_MACH_PCM037)       += pcm037.o