Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33fcb13d authored by Stephen Boyd's avatar Stephen Boyd Committed by David Brown
Browse files

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: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
parent cb03af01

arch/arm/mach-msm/Kconfig

+6 −2
Original line number Diff line number Diff line 
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