---

yaml
---
r: 137237
b: refs/heads/master
c: 6bbdbf2
h: refs/heads/master
i:
  137235: f59eb32
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87bbb19721fbd6b5e556105c188da80d06f738b1
+refs/heads/master: 6bbdbf2f95771c0a2dbccc423b99b37fde9a5078

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

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

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

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