aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500/Kconfig
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-02-29 12:15:20 -0500
committerLinus Walleij <linus.walleij@linaro.org>2012-02-29 12:31:18 -0500
commit5017f1cd9b980c3975d25ca530a578281e91aa04 (patch)
tree5d81d17bf7307d70f4d24badb1b6ecbe38cf9e1a /arch/arm/mach-ux500/Kconfig
parent382bd12528777be5236acf0a19e016aebfc9a34a (diff)
ARM: ux500: solve some Kconfig mess
First rename the config option MACH_U8500 to MACH_MOP500 because that is what it's obviously all about, this has confused me for the last time. Fix some whitespace in the process. Since the machine descriptors for HREFv60 and snowball are clearly in the file board-mop500.c which only compiles if MACH_MOP500 (former MACH_U8500) is set, select this for the board variants and nothing else. For the MOP500 variants the UIB (user interface board) is probed using I2C so select I2C and I2C_NOMADIK so we know that this probe will always be successful. Cc: Arnd Bergmann <arnd@arndb.de> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/Kconfig')
-rw-r--r--arch/arm/mach-ux500/Kconfig23
1 files changed, 13 insertions, 10 deletions
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index d00881297202..d205de47d3c6 100644
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -22,21 +22,24 @@ config UX500_SOC_DB8500
22 22
23menu "Ux500 target platform (boards)" 23menu "Ux500 target platform (boards)"
24 24
25config MACH_U8500 25config MACH_MOP500
26 bool "U8500 Development platform" 26 bool "U8500 Development platform, MOP500 versions"
27 select UX500_SOC_DB8500 27 select UX500_SOC_DB8500
28 select I2C
29 select I2C_NOMADIK
28 help 30 help
29 Include support for the mop500 development platform. 31 Include support for the MOP500 development platform.
30 32
31config MACH_HREFV60 33config MACH_HREFV60
32 bool "U85000 Development platform, HREFv60 version" 34 bool "U8500 Development platform, HREFv60 version"
33 select UX500_SOC_DB8500 35 select MACH_MOP500
34 help 36 help
35 Include support for the HREFv60 new development platform. 37 Include support for the HREFv60 new development platform.
38 Includes HREFv70, v71 etc.
36 39
37config MACH_SNOWBALL 40config MACH_SNOWBALL
38 bool "U8500 Snowball platform" 41 bool "U8500 Snowball platform"
39 select MACH_U8500 42 select MACH_MOP500
40 help 43 help
41 Include support for the snowball development platform. 44 Include support for the snowball development platform.
42 45
@@ -49,11 +52,11 @@ config MACH_U5500
49config UX500_AUTO_PLATFORM 52config UX500_AUTO_PLATFORM
50 def_bool y 53 def_bool y
51 depends on !MACH_U5500 54 depends on !MACH_U5500
52 select MACH_U8500 55 select MACH_MOP500
53 help 56 help
54 At least one platform needs to be selected in order to build 57 At least one platform needs to be selected in order to build
55 a working kernel. If everything else is disabled, this 58 a working kernel. If everything else is disabled, this
56 automatically enables MACH_U8500. 59 automatically enables MACH_MOP500.
57endmenu 60endmenu
58 61
59config UX500_DEBUG_UART 62config UX500_DEBUG_UART