arm/imx: Kconfig beautification

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

diff --git a/arch/arm/mach-mx1/Kconfig b/arch/arm/mach-mx1/Kconfig
index f86cfcb..eb7660f 100644 (file)
--- a/arch/arm/mach-mx1/Kconfig
+++ b/arch/arm/mach-mx1/Kconfig
@@ -1,6 +1,6 @@
 if ARCH_MX1
 
 if ARCH_MX1
 

-comment "MX1 Platforms"
+comment "MX1 platforms:"

 
 config MACH_MXLADS
        bool
 
 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
        bool "Synertronixx scb9328"
        help
          Say Y here if you are using a Synertronixx scb9328 board

+

 endif
 endif

diff --git a/arch/arm/mach-mx2/Kconfig b/arch/arm/mach-mx2/Kconfig
index 412d2d5..42a7888 100644 (file)
--- a/arch/arm/mach-mx2/Kconfig
+++ b/arch/arm/mach-mx2/Kconfig
@@ -1,27 +1,22 @@
-comment "MX2 family CPU support"
-       depends on ARCH_MX2
+if ARCH_MX2

 
 choice
 
 choice

-       prompt "MX2 Type"
-       depends on ARCH_MX2
+       prompt "CPUs:"

        default MACH_MX21
 
 config MACH_MX21
        bool "i.MX21 support"
        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"
        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
 
        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"
 
 config MACH_MX27ADS
        bool "MX27ADS platform"


@@ -50,3 +45,5 @@ config MACH_PCM970_BASEBOARD
          PCM970 evaluation board.
 
 endchoice
          PCM970 evaluation board.
 
 endchoice

+
+endif

diff --git a/arch/arm/mach-mx3/Kconfig b/arch/arm/mach-mx3/Kconfig
index 6fea541..6933d2d 100644 (file)
--- a/arch/arm/mach-mx3/Kconfig
+++ b/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"
 
 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.
 
          Include support for mx31moboard platform. This includes specific
          configurations for the board and its peripherals.
 

-endmenu
-
+endif

diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index 71c3c84..ed5ab8e 100644 (file)
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -3,7 +3,7 @@ if ARCH_MXC
 menu "Freescale MXC Implementations"
 
 choice
 menu "Freescale MXC Implementations"
 
 choice

-       prompt "MXC/iMX Base Type"
+       prompt "Freescale CPU family:"

        default ARCH_MX3
 
 config ARCH_MX1
        default ARCH_MX3
 
 config ARCH_MX1