1 files changed, 15 insertions, 4 deletions

diff --git a/arch/arm/mach-mx2/Kconfig b/arch/arm/mach-mx2/Kconfig
index c8a2eac4d13c..742fd4e6dcb9 100644
--- a/arch/arm/mach-mx2/Kconfig
+++ b/arch/arm/mach-mx2/Kconfig
@@ -6,11 +6,13 @@ choice
 
 config MACH_MX21
         bool "i.MX21 support"
+        select ARCH_MXC_AUDMUX_V1
         help
           This enables support for Freescale's MX2 based i.MX21 processor.
 
 config MACH_MX27
         bool "i.MX27 support"
+        select ARCH_MXC_AUDMUX_V1
         help
           This enables support for Freescale's MX2 based i.MX27 processor.
 
@@ -35,6 +37,7 @@ config MACH_MX27ADS
 config MACH_PCM038
         bool "Phytec phyCORE-i.MX27 CPU module (pcm038)"
         depends on MACH_MX27
+        select MXC_ULPI if USB_ULPI
         help
           Include support for phyCORE-i.MX27 (aka pcm038) platform. This
           includes specific configurations for the module and its peripherals.
@@ -53,7 +56,7 @@ config MACH_PCM970_BASEBOARD
 
 endchoice
 
-config MACH_EUKREA_CPUIMX27
+config MACH_CPUIMX27
         bool "Eukrea CPUIMX27 module"
         depends on MACH_MX27
         help
@@ -62,14 +65,14 @@ config MACH_EUKREA_CPUIMX27
 
 config MACH_EUKREA_CPUIMX27_USESDHC2
         bool "CPUIMX27 integrates SDHC2 module"
-        depends on MACH_EUKREA_CPUIMX27
+        depends on MACH_CPUIMX27
         help
           This adds support for the internal SDHC2 used on CPUIMX27 used
           for wifi or eMMC.
 
 choice
         prompt "Baseboard"
-        depends on MACH_EUKREA_CPUIMX27
+        depends on MACH_CPUIMX27
         default MACH_EUKREA_MBIMX27_BASEBOARD
 
 config MACH_EUKREA_MBIMX27_BASEBOARD
@@ -88,7 +91,7 @@ config MACH_MX27_3DS
           Include support for MX27PDK platform. This includes specific
           configurations for the board and its peripherals.
 
-config MACH_MX27LITE
+config MACH_IMX27LITE
         bool "LogicPD MX27 LITEKIT platform"
         depends on MACH_MX27
         help
@@ -98,8 +101,16 @@ config MACH_MX27LITE
 config MACH_PCA100
         bool "Phytec phyCARD-s (pca100)"
         depends on MACH_MX27
+        select MXC_ULPI if USB_ULPI
         help
           Include support for phyCARD-s (aka pca100) platform. This
           includes specific configurations for the module and its peripherals.
 
+config MACH_MXT_TD60
+        bool "Maxtrack i-MXT TD60"
+        depends on MACH_MX27
+        help
+          Include support for i-MXT (aka td60) platform. This
+          includes specific configurations for the module and its peripherals.
+
 endif