Minor cosmetic clean-up for LDP for mainline

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / Kconfig

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 6208147f4210431f4b2d74ad1134c0f384214693..b03e2533b1696e5f7a7d8b310d38db8169b8bca2 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -35,7 +35,7 @@ config MACH_OMAP_GENERIC
 config MACH_NOKIA_N800
        bool "Nokia N800"
        depends on ARCH_OMAP2420
-       select VIDEO_TCM825X if VIDEO_OMAP2
+       select VIDEO_TCM825X if VIDEO_OMAP2 && VIDEO_HELPER_CHIPS_AUTO
        select CBUS if VIDEO_TCM825X
        select CBUS_RETU if VIDEO_TCM825X
        select MENELAUS if VIDEO_TCM825X
@@ -45,6 +45,11 @@ config MACH_NOKIA_N810
        bool "Nokia N810"
        depends on MACH_NOKIA_N800
 
+config MACH_NOKIA_N810_WIMAX
+       bool "Nokia N810 WiMAX"
+       depends on MACH_NOKIA_N800
+       select MACH_NOKIA_N810
+
 config MACH_OMAP2_TUSB6010
        bool
        depends on ARCH_OMAP2 && ARCH_OMAP2420
@@ -98,10 +103,42 @@ config MACH_OMAP_2430SDP
        bool "OMAP 2430 SDP board"
        depends on ARCH_OMAP2 && ARCH_OMAP2430
 
+config MACH_OMAP_LDP
+       bool "OMAP3 LDP board"
+       depends on ARCH_OMAP3 && ARCH_OMAP34XX
+
+config MACH_OMAP2EVM 
+       bool "OMAP 2530 EVM board"
+       depends on ARCH_OMAP2 && ARCH_OMAP24XX
+
 config MACH_OMAP_3430SDP
        bool "OMAP 3430 SDP board"
        depends on ARCH_OMAP3 && ARCH_OMAP34XX
 
-config MACH_OMAP_2430OSK
-       bool "OMAP 2430 OSK board"
-       depends on ARCH_OMAP2 && ARCH_OMAP24XX
+config MACH_OMAP3EVM
+       bool "OMAP 3530 EVM board"
+       depends on ARCH_OMAP3 && ARCH_OMAP34XX
+
+config MACH_OMAP3_BEAGLE
+       bool "OMAP3 BEAGLE board"
+       depends on ARCH_OMAP3 && ARCH_OMAP34XX
+
+config MACH_OVERO
+       bool "Gumstix Overo board"
+       depends on ARCH_OMAP3 && ARCH_OMAP34XX
+
+config OMAP_TICK_GPTIMER
+       int "GPTIMER used for system tick timer"
+       depends on ARCH_OMAP2 || ARCH_OMAP3
+       range 1 12
+       default 1
+       help
+         Linux uses one of the twelve on-board OMAP GPTIMER blocks to generate
+         system tick interrupts.  The twelve GPTIMERs have slightly
+         different powerdomain, source clock, and security properties
+         (mostly documented in the OMAP3 TRMs) that can affect the selection
+         of which GPTIMER to use.  The historical default is GPTIMER1.
+         If CONFIG_OMAP_32K_TIMER is selected, Beagle may require GPTIMER12
+         due to hardware sensitivity to glitches on the OMAP 32kHz clock
+         input.
+