1 files changed, 78 insertions, 14 deletions

diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index b9fd5c528e5b..47264a76eeb3 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -1,7 +1,80 @@
 if ARCH_MSM
 
-comment "MSM Board Type"
+choice
+        prompt "Qualcomm MSM SoC Type"
+        default ARCH_MSM7X00A
+
+config ARCH_MSM7X00A
+        bool "MSM7x00A / MSM7x01A"
+        select ARCH_MSM_ARM11
+        select MSM_SMD
+        select MSM_SMD_PKG3
+        select CPU_V6
+
+config ARCH_MSM7X30
+        bool "MSM7x30"
+        select ARCH_MSM_SCORPION
+        select MSM_SMD
+        select MSM_VIC
+        select CPU_V7
+        select MSM_REMOTE_SPINLOCK_DEKKERS
+
+config ARCH_QSD8X50
+        bool "QSD8X50"
+        select ARCH_MSM_SCORPION
+        select MSM_SMD
+        select MSM_VIC
+        select CPU_V7
+        select MSM_REMOTE_SPINLOCK_LDREX
+endchoice
+
+config MSM_SOC_REV_A
+        bool
+
+config  ARCH_MSM_ARM11
+        bool
+config  ARCH_MSM_SCORPION
+        bool
+
+config  MSM_VIC
+        bool
+
+menu "Qualcomm MSM Board Type"
+
+config MACH_HALIBUT
         depends on ARCH_MSM
+        depends on ARCH_MSM7X00A
+        bool "Halibut Board (QCT SURF7201A)"
+        help
+          Support for the Qualcomm SURF7201A eval board.
+
+config MACH_TROUT
+        depends on ARCH_MSM
+        depends on ARCH_MSM7X00A
+        bool "HTC Dream (aka trout)"
+        help
+          Support for the HTC Dream, T-Mobile G1, Android ADP1 devices.
+
+config MACH_MSM7X30_SURF
+        depends on ARCH_MSM7X30
+        bool "MSM7x30 SURF"
+        help
+          Support for the Qualcomm MSM7x30 SURF eval board.
+
+config MACH_QSD8X50_SURF
+        depends on ARCH_QSD8X50
+        bool "QSD8x50 SURF"
+        help
+          Support for the Qualcomm QSD8x50 SURF eval board.
+
+config MACH_QSD8X50A_ST1_5
+        depends on ARCH_QSD8X50
+        select MSM_SOC_REV_A
+        bool "QSD8x50A ST1.5"
+        help
+          Support for the Qualcomm ST1.5.
+
+endmenu
 
 config MSM_DEBUG_UART
         int
@@ -27,19 +100,10 @@ choice
                 bool "UART3"
 endchoice
 
-config MACH_HALIBUT
-        depends on ARCH_MSM
-        select CPU_V6
-        default y
-        bool "Halibut Board (QCT SURF7201A)"
-        help
-          Support for the Qualcomm SURF7201A eval board.
+config MSM_SMD_PKG3
+        bool
 
-config MACH_TROUT
-        select CPU_V6
-        default y
-        bool "HTC Dream (aka trout)"
-        help
-          Support for the HTC Dream, T-Mobile G1, Android ADP1 devices.
+config MSM_SMD
+        bool
 
 endif