From 79a26433de5fb0f91c8d9b4d24734a8181439bb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
Date: Mon, 14 Jun 2010 17:39:21 +0200
Subject: [PATCH] --- yaml --- r: 201623 b: refs/heads/master c:
 e780d2392dd37fcc231d97400c1cdd8d261ed556 h: refs/heads/master i:   201621:
 47585405975a3ad3a284c439facbe26f723a6402   201619:
 79d08b0c0de55598db40c36ff14ff7baee6befd6   201615:
 c7fd1893b682c5ca3b1ff911337c54ccea8595e0 v: v3

---
 [refs]                          |  2 +-
 trunk/arch/arm/mach-imx/Kconfig | 21 +++++++++++++++++++--
 trunk/arch/arm/plat-mxc/Kconfig |  5 +----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 097a5ec2978d..eca81cff386f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6b06be062daf3a8a2a2bb93585564c7aa1fa8d3
+refs/heads/master: e780d2392dd37fcc231d97400c1cdd8d261ed556
diff --git a/trunk/arch/arm/mach-imx/Kconfig b/trunk/arch/arm/mach-imx/Kconfig
index 3ca8fa7d91ae..5edead235bd1 100644
--- a/trunk/arch/arm/mach-imx/Kconfig
+++ b/trunk/arch/arm/mach-imx/Kconfig
@@ -1,5 +1,10 @@
 if ARCH_MX1
 
+config SOC_IMX1
+	select CPU_ARM920T
+	select IMX_HAVE_IOMUX_V1
+	bool
+
 comment "MX1 platforms:"
 config MACH_MXLADS
 	bool
@@ -19,19 +24,31 @@ endif
 
 if ARCH_MX2
 
+config SOC_IMX21
+	select CPU_ARM926T
+	select ARCH_MXC_AUDMUX_V1
+	select IMX_HAVE_IOMUX_V1
+	bool
+
+config SOC_IMX27
+	select CPU_ARM926T
+	select ARCH_MXC_AUDMUX_V1
+	select IMX_HAVE_IOMUX_V1
+	bool
+
 choice
 	prompt "CPUs:"
 	default MACH_MX21
 
 config MACH_MX21
 	bool "i.MX21 support"
-	select ARCH_MXC_AUDMUX_V1
+	select SOC_IMX21
 	help
 	  This enables support for Freescale's MX2 based i.MX21 processor.
 
 config MACH_MX27
 	bool "i.MX27 support"
-	select ARCH_MXC_AUDMUX_V1
+	select SOC_IMX27
 	help
 	  This enables support for Freescale's MX2 based i.MX27 processor.
 
diff --git a/trunk/arch/arm/plat-mxc/Kconfig b/trunk/arch/arm/plat-mxc/Kconfig
index 3adad3822279..d80de4eacd2a 100644
--- a/trunk/arch/arm/plat-mxc/Kconfig
+++ b/trunk/arch/arm/plat-mxc/Kconfig
@@ -8,15 +8,12 @@ choice
 
 config ARCH_MX1
 	bool "MX1-based"
-	select CPU_ARM920T
-	select IMX_HAVE_IOMUX_V1
+	select SOC_IMX1
 	help
 	  This enables support for systems based on the Freescale i.MX1 family
 
 config ARCH_MX2
 	bool "MX2-based"
-	select CPU_ARM926T
-	select IMX_HAVE_IOMUX_V1
 	help
 	  This enables support for systems based on the Freescale i.MX2 family