---
 arch/arm/Kconfig |   51 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 46 insertions(+), 5 deletions(-)

Index: arch/arm/Kconfig
===================================================================
--- arch/arm/Kconfig.orig
+++ arch/arm/Kconfig
@@ -333,6 +333,13 @@ config ARCH_MXC
 	help
 	  Support for Freescale MXC/iMX-based family of processors
 
+config ARCH_MXC
+	bool "Freescale MXC/iMX-based"
+	select ISA
+	select ARCH_MTD_XIP
+	help
+	  Support for Freescale MXC/iMX-based family of processors
+
 config ARCH_PNX4008
 	bool "Philips Nexperia PNX4008 Mobile"
 	help
@@ -469,6 +476,8 @@ source "arch/arm/mach-at91/Kconfig"
 
 source "arch/arm/plat-mxc/Kconfig"
 
+source "arch/arm/plat-mxc/Kconfig"
+
 source "arch/arm/mach-netx/Kconfig"
 
 source "arch/arm/mach-ns9xxx/Kconfig"
@@ -710,7 +719,7 @@ config LEDS
 		   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
 		   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
 		   ARCH_AT91 || MACH_TRIZEPS4 || ARCH_DAVINCI || \
-		   ARCH_KS8695
+		   ARCH_KS8695 || ARCH_MXC
 	help
 	  If you say Y here, the LEDs on your machine will be used
 	  to provide useful information about your current system status.
@@ -725,7 +734,7 @@ config LEDS
 config LEDS_TIMER
 	bool "Timer LED" if (!ARCH_CDB89712 && !ARCH_OMAP) || \
 			    OMAP_OSK_MISTRAL || MACH_OMAP_H2 \
-			    || MACH_OMAP_PERSEUS2
+			    || MACH_OMAP_PERSEUS2 || ARCH_MXC
 	depends on LEDS
 	depends on !GENERIC_CLOCKEVENTS
 	default y if ARCH_EBSA110
@@ -744,7 +753,7 @@ config LEDS_CPU
 	bool "CPU usage LED" if (!ARCH_CDB89712 && !ARCH_EBSA110 && \
 			!ARCH_OMAP) \
 			|| OMAP_OSK_MISTRAL || MACH_OMAP_H2 \
-			|| MACH_OMAP_PERSEUS2
+			|| MACH_OMAP_PERSEUS2 || ARCH_MXC
 	depends on LEDS
 	help
 	  If you say Y here, the red LED will be used to give a good real
@@ -861,7 +870,7 @@ config KEXEC
 
 endmenu
 
-if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX )
+if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_MXC)
 
 menu "CPU Frequency scaling"
 
@@ -955,6 +964,8 @@ config VFP
 
 	  Say N if your target does not have VFP hardware.
 
+source "drivers/dpm/Kconfig"
+
 endmenu
 
 menu "Userspace binary formats"
@@ -1004,7 +1015,7 @@ source "drivers/misc/Kconfig"
 if PCMCIA || ARCH_CLPS7500 || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX \
 	|| ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC \
 	|| ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE \
-	|| ARCH_IXP23XX
+	|| ARCH_IXP23XX || ARCH_MX3 || ARCH_MX27
 source "drivers/ide/Kconfig"
 endif
 
@@ -1066,6 +1077,10 @@ source "drivers/rtc/Kconfig"
 
 source "drivers/dma/Kconfig"
 
+if ARCH_MXC
+source "drivers/mxc/Kconfig"
+endif
+
 endmenu
 
 source "fs/Kconfig"
@@ -1074,6 +1089,32 @@ source "kernel/Kconfig.instrumentation"
 
 source "arch/arm/Kconfig.debug"
 
+menu "CodeTEST setup"
+
+config CODETEST
+	bool "Turn on Freescale CodeTEST support"
+
+config CT_HOOKS_ENABLED
+	bool "Enable hooks by default"
+	depends on CODETEST
+
+config CT_USEPCI
+	bool "Use PCI Adapter"
+	depends on CODETEST
+
+config CT_USEMICTOR
+	bool
+	depends on CODETEST
+	default n if CT_USEPCI
+	default y if !CT_USEPCI
+
+config CT_ADDR
+	hex "Tag Port Physical Address"
+	depends on CODETEST && CT_USEMICTOR
+	default 0x14000000
+
+endmenu
+
 source "security/Kconfig"
 
 source "crypto/Kconfig"
--- arch/arm/Kconfig.orig
+++ arch/arm/Kconfig
@@ -476,8 +476,6 @@ source "arch/arm/mach-at91/Kconfig"
 
 source "arch/arm/plat-mxc/Kconfig"
 
-source "arch/arm/plat-mxc/Kconfig"
-
 source "arch/arm/mach-netx/Kconfig"
 
 source "arch/arm/mach-ns9xxx/Kconfig"
@@ -964,8 +962,6 @@ config VFP
 
 	  Say N if your target does not have VFP hardware.
 
-source "drivers/dpm/Kconfig"
-
 endmenu
 
 menu "Userspace binary formats"
@@ -1077,10 +1073,6 @@ source "drivers/rtc/Kconfig"
 
 source "drivers/dma/Kconfig"
 
-if ARCH_MXC
-source "drivers/mxc/Kconfig"
-endif
-
 endmenu
 
 source "fs/Kconfig"
Index: arch/arm/mach-mx27/Makefile
===================================================================
--- arch/arm/Kconfig.orig
+++ arch/arm/Kconfig
@@ -329,14 +329,6 @@ config ARCH_NS9XXX
 
 config ARCH_MXC
 	bool "Freescale MXC/iMX-based"
-	select ARCH_MTD_XIP
-	help
-	  Support for Freescale MXC/iMX-based family of processors
-
-config ARCH_MXC
-	bool "Freescale MXC/iMX-based"
-	select ISA
-	select ARCH_MTD_XIP
 	help
 	  Support for Freescale MXC/iMX-based family of processors
 
Index: arch/arm/mach-mx27/devices.c
===================================================================