ARM: msm: Allow 8960 and 8660 to compile together

Modify the Kconfig to allow the MSM 8660 and MSM 8960 targets to
compile together in the same build. As long as one of these two
targets is selected the choice menu used to select which SoC to
support will be hidden. Deselecting both of these targets will
reintroduce the choice menu, and allow users to select targets
that must be compiled in isolation.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>

1 files changed, 6 insertions, 2 deletions

diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 1cd40ad301d3..03c549369ce3 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -1,8 +1,12 @@
 if ARCH_MSM
 
+comment "Qualcomm MSM SoC Type"
+        depends on (ARCH_MSM8X60 || ARCH_MSM8960)
+
 choice
         prompt "Qualcomm MSM SoC Type"
         default ARCH_MSM7X00A
+        depends on !(ARCH_MSM8X60 || ARCH_MSM8960)
 
 config ARCH_MSM7X00A
         bool "MSM7x00A / MSM7x01A"
@@ -36,6 +40,8 @@ config ARCH_QSD8X50
         select GPIO_MSM_V1
         select MSM_PROC_COMM
 
+endchoice
+
 config ARCH_MSM8X60
         bool "MSM8X60"
         select MACH_MSM8X60_SURF if (!MACH_MSM8X60_RUMI3 && !MACH_MSM8X60_SIM \
@@ -58,8 +64,6 @@ config ARCH_MSM8960
         select MSM_GPIOMUX
         select MSM_SCM if SMP
 
-endchoice
-
 config MSM_HAS_DEBUG_UART_HS
         bool