Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / arm / mach-ux500 / Kconfig

diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index 2dd44a0..247caa3 100644 (file)
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -7,28 +7,30 @@ config UX500_SOC_COMMON
        select HAS_MTU
        select NOMADIK_GPIO
 
-config UX500_SOC_DB8500
-       bool
+menu "Ux500 SoC"
 
 config UX500_SOC_DB5500
-       bool
+       bool "DB5500"
+
+config UX500_SOC_DB8500
+       bool "DB8500"
+
+endmenu
 
-choice
-       prompt "Ux500 target platform"
-       default MACH_U8500_MOP
+menu "Ux500 target platform"
 
-config MACH_U8500_MOP
+config MACH_U8500
        bool "U8500 Development platform"
-       select UX500_SOC_DB8500
+       depends on UX500_SOC_DB8500
        help
          Include support for the mop500 development platform.
 
 config MACH_U5500
        bool "U5500 Development platform"
-       select UX500_SOC_DB5500
+       depends on UX500_SOC_DB5500
        help
          Include support for the U5500 development platform.
-endchoice
+endmenu
 
 config UX500_DEBUG_UART
        int "Ux500 UART to use for low-level debug"
@@ -39,14 +41,14 @@ config UX500_DEBUG_UART
 
 config U5500_MODEM_IRQ
        bool "Modem IRQ support"
-       depends on MACH_U5500
+       depends on UX500_SOC_DB5500
        default y
        help
          Add support for handling IRQ:s from modem side
 
 config U5500_MBOX
        bool "Mailbox support"
-       depends on MACH_U5500 && U5500_MODEM_IRQ
+       depends on U5500_MODEM_IRQ
        default y
        help
          Add support for U5500 mailbox communication with modem side