X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=arch%2Farm%2Fmach-omap2%2FKconfig;h=8fa650d35365267585e2883f3ef9dd87e13447f2;hb=65ca5fe85ce09659729dc0322bdb8508258cdab0;hp=ac9a7e1890384691ce1b08552370fd616c12ae76;hpb=f4eb51b909144550048b7922ebd1904a54005394;p=linux-2.6-omap-h63xx.git

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index ac9a7e18903..8fa650d3536 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -10,11 +10,13 @@ config ARCH_OMAP2420
 	depends on ARCH_OMAP24XX
 	select OMAP_DM_TIMER
 	select ARCH_OMAP_OTG
+	select CPU_V6
 
 config ARCH_OMAP2430
 	bool "OMAP2430 support"
 	depends on ARCH_OMAP24XX
 	select ARCH_OMAP_OTG
+	select CPU_V6
 
 config ARCH_OMAP34XX
 	bool "OMAP34xx Based System"
@@ -24,6 +26,7 @@ config ARCH_OMAP3430
 	bool "OMAP3430 support"
 	depends on ARCH_OMAP3 && ARCH_OMAP34XX
 	select ARCH_OMAP_OTG
+	select CPU_V7
 
 comment "OMAP Board Type"
 	depends on ARCH_OMAP2 || ARCH_OMAP3
@@ -45,6 +48,15 @@ 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_NOKIA_RX51
+	bool "Nokia RX-51 board"
+	depends on ARCH_OMAP3 && ARCH_OMAP34XX
+
 config MACH_OMAP2_TUSB6010
 	bool
 	depends on ARCH_OMAP2 && ARCH_OMAP2420
@@ -54,7 +66,6 @@ config MACH_OMAP_H4
 	bool "OMAP 2420 H4 board"
 	depends on ARCH_OMAP2 && ARCH_OMAP2420
 	select OMAP_DEBUG_DEVICES
-	select GPIOEXPANDER_OMAP
 
 config MACH_OMAP_H4_TUSB
 	bool "TUSB 6010 EVM board"
@@ -99,11 +110,11 @@ config MACH_OMAP_2430SDP
 	depends on ARCH_OMAP2 && ARCH_OMAP2430
 
 config MACH_OMAP_LDP
-	bool "OMAP 3 LDP board"
+	bool "OMAP3 LDP board"
 	depends on ARCH_OMAP3 && ARCH_OMAP34XX
 
-config MACH_OMAP_2430OSK
-	bool "OMAP 2430 OSK board"
+config MACH_OMAP2EVM 
+	bool "OMAP 2530 EVM board"
 	depends on ARCH_OMAP2 && ARCH_OMAP24XX
 
 config MACH_OMAP_3430SDP
@@ -117,3 +128,11 @@ config MACH_OMAP3EVM
 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 MACH_OMAP3_PANDORA
+	bool "OMAP3 Pandora"
+	depends on ARCH_OMAP3 && ARCH_OMAP34XX