From a74768f258c9a55956a365873d7e83ee2b677e15 Mon Sep 17 00:00:00 2001
From: Holger Schurig <hs4233@mail.mn-solutions.de>
Date: Thu, 29 Jan 2009 14:42:25 +0100
Subject: [PATCH] --- yaml --- r: 137237 b: refs/heads/master c:
 6bbdbf2f95771c0a2dbccc423b99b37fde9a5078 h: refs/heads/master i:   137235:
 f59eb323cd29722fe10fdbffea51644e4f5bd77d v: v3

---
 [refs]                          |  2 +-
 trunk/arch/arm/mach-mx1/Kconfig |  3 ++-
 trunk/arch/arm/mach-mx2/Kconfig | 13 +++++--------
 trunk/arch/arm/mach-mx3/Kconfig |  8 ++++----
 trunk/arch/arm/plat-mxc/Kconfig |  2 +-
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index d22b3321149a..5abbf6d77802 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87bbb19721fbd6b5e556105c188da80d06f738b1
+refs/heads/master: 6bbdbf2f95771c0a2dbccc423b99b37fde9a5078
diff --git a/trunk/arch/arm/mach-mx1/Kconfig b/trunk/arch/arm/mach-mx1/Kconfig
index f86cfcb60224..eb7660f5d4b7 100644
--- a/trunk/arch/arm/mach-mx1/Kconfig
+++ b/trunk/arch/arm/mach-mx1/Kconfig
@@ -1,6 +1,6 @@
 if ARCH_MX1
 
-comment "MX1 Platforms"
+comment "MX1 platforms:"
 
 config MACH_MXLADS
 	bool
@@ -15,4 +15,5 @@ config MACH_SCB9328
 	bool "Synertronixx scb9328"
 	help
 	  Say Y here if you are using a Synertronixx scb9328 board
+
 endif
diff --git a/trunk/arch/arm/mach-mx2/Kconfig b/trunk/arch/arm/mach-mx2/Kconfig
index 412d2d55b08c..42a788842f49 100644
--- a/trunk/arch/arm/mach-mx2/Kconfig
+++ b/trunk/arch/arm/mach-mx2/Kconfig
@@ -1,27 +1,22 @@
-comment "MX2 family CPU support"
-	depends on ARCH_MX2
+if ARCH_MX2
 
 choice
-	prompt "MX2 Type"
-	depends on ARCH_MX2
+	prompt "CPUs:"
 	default MACH_MX21
 
 config MACH_MX21
 	bool "i.MX21 support"
-	depends on ARCH_MX2
 	help
 	  This enables support for Freescale's MX2 based i.MX21 processor.
 
 config MACH_MX27
 	bool "i.MX27 support"
-	depends on ARCH_MX2
 	help
 	  This enables support for Freescale's MX2 based i.MX27 processor.
 
 endchoice
 
-comment "MX2 Platforms"
-	depends on ARCH_MX2
+comment "MX2 platforms:"
 
 config MACH_MX27ADS
 	bool "MX27ADS platform"
@@ -50,3 +45,5 @@ config MACH_PCM970_BASEBOARD
 	  PCM970 evaluation board.
 
 endchoice
+
+endif
diff --git a/trunk/arch/arm/mach-mx3/Kconfig b/trunk/arch/arm/mach-mx3/Kconfig
index 6fea54196324..6933d2d0b568 100644
--- a/trunk/arch/arm/mach-mx3/Kconfig
+++ b/trunk/arch/arm/mach-mx3/Kconfig
@@ -1,5 +1,6 @@
-menu "MX3 Options"
-	depends on ARCH_MX3
+if ARCH_MX3
+
+comment "MX3 platforms:"
 
 config MACH_MX31ADS
 	bool "Support MX31ADS platforms"
@@ -44,5 +45,4 @@ config MACH_MX31MOBOARD
 	  Include support for mx31moboard platform. This includes specific
 	  configurations for the board and its peripherals.
 
-endmenu
-
+endif
diff --git a/trunk/arch/arm/plat-mxc/Kconfig b/trunk/arch/arm/plat-mxc/Kconfig
index 71c3c848b0e2..ed5ab8ed7cfa 100644
--- a/trunk/arch/arm/plat-mxc/Kconfig
+++ b/trunk/arch/arm/plat-mxc/Kconfig
@@ -3,7 +3,7 @@ if ARCH_MXC
 menu "Freescale MXC Implementations"
 
 choice
-	prompt "MXC/iMX Base Type"
+	prompt "Freescale CPU family:"
 	default ARCH_MX3
 
 config ARCH_MX1