1 files changed, 2 insertions, 39 deletions
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 1cd40ad301d3..b2740c800e8c 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -38,8 +38,6 @@ config ARCH_QSD8X50
 config ARCH_MSM8X60
        bool "MSM8X60"
-        select MACH_MSM8X60_SURF if (!MACH_MSM8X60_RUMI3 && !MACH_MSM8X60_SIM \
-                                  && !MACH_MSM8X60_FFA)
        select ARCH_MSM_SCORPIONMP
        select ARM_GIC
        select CPU_V7
@@ -47,16 +45,17 @@ config ARCH_MSM8X60
        select GPIO_MSM_V2
        select MSM_GPIOMUX
        select MSM_SCM if SMP
+        select USE_OF
 config ARCH_MSM8960
        bool "MSM8960"
        select ARCH_MSM_SCORPIONMP
-        select MACH_MSM8960_SIM if (!MACH_MSM8960_RUMI3)
        select ARM_GIC
        select CPU_V7
        select MSM_V2_TLMM
        select MSM_GPIOMUX
        select MSM_SCM if SMP
+        select USE_OF
 endchoice
@@ -112,42 +111,6 @@ config MACH_QSD8X50A_ST1_5
        help
          Support for the Qualcomm ST1.5.
-config MACH_MSM8X60_RUMI3
-        depends on ARCH_MSM8X60
-        bool "MSM8x60 RUMI3"
-        help
-          Support for the Qualcomm MSM8x60 RUMI3 emulator.
-config MACH_MSM8X60_SURF
-        depends on ARCH_MSM8X60
-        bool "MSM8x60 SURF"
-        help
-          Support for the Qualcomm MSM8x60 SURF eval board.
-config MACH_MSM8X60_SIM
-        depends on ARCH_MSM8X60
-        bool "MSM8x60 Simulator"
-        help
-          Support for the Qualcomm MSM8x60 simulator.
-config MACH_MSM8X60_FFA
-        depends on ARCH_MSM8X60
-        bool "MSM8x60 FFA"
-        help
-          Support for the Qualcomm MSM8x60 FFA eval board.
-config MACH_MSM8960_SIM
-        depends on ARCH_MSM8960
-        bool "MSM8960 Simulator"
-        help
-          Support for the Qualcomm MSM8960 simulator.
-config MACH_MSM8960_RUMI3
-        depends on ARCH_MSM8960
-        bool "MSM8960 RUMI3"
-        help
-          Support for the Qualcomm MSM8960 RUMI3 emulator.
 endmenu
 config MSM_SMD_PKG3

diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index 1cd40ad301d3..b2740c800e8c 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig
@@ -38,8 +38,6 @@ config ARCH_QSD8X50
38		38
39	config ARCH_MSM8X60	39	config ARCH_MSM8X60
40	bool "MSM8X60"	40	bool "MSM8X60"
41	select MACH_MSM8X60_SURF if (!MACH_MSM8X60_RUMI3 && !MACH_MSM8X60_SIM \
42	&& !MACH_MSM8X60_FFA)
43	select ARCH_MSM_SCORPIONMP	41	select ARCH_MSM_SCORPIONMP
44	select ARM_GIC	42	select ARM_GIC
45	select CPU_V7	43	select CPU_V7
@@ -47,16 +45,17 @@ config ARCH_MSM8X60
47	select GPIO_MSM_V2	45	select GPIO_MSM_V2
48	select MSM_GPIOMUX	46	select MSM_GPIOMUX
49	select MSM_SCM if SMP	47	select MSM_SCM if SMP
		48	select USE_OF
50		49
51	config ARCH_MSM8960	50	config ARCH_MSM8960
52	bool "MSM8960"	51	bool "MSM8960"
53	select ARCH_MSM_SCORPIONMP	52	select ARCH_MSM_SCORPIONMP
54	select MACH_MSM8960_SIM if (!MACH_MSM8960_RUMI3)
55	select ARM_GIC	53	select ARM_GIC
56	select CPU_V7	54	select CPU_V7
57	select MSM_V2_TLMM	55	select MSM_V2_TLMM
58	select MSM_GPIOMUX	56	select MSM_GPIOMUX
59	select MSM_SCM if SMP	57	select MSM_SCM if SMP
		58	select USE_OF
60		59
61	endchoice	60	endchoice
62		61
@@ -112,42 +111,6 @@ config MACH_QSD8X50A_ST1_5
112	help	111	help
113	Support for the Qualcomm ST1.5.	112	Support for the Qualcomm ST1.5.
114		113
115	config MACH_MSM8X60_RUMI3
116	depends on ARCH_MSM8X60
117	bool "MSM8x60 RUMI3"
118	help
119	Support for the Qualcomm MSM8x60 RUMI3 emulator.
120
121	config MACH_MSM8X60_SURF
122	depends on ARCH_MSM8X60
123	bool "MSM8x60 SURF"
124	help
125	Support for the Qualcomm MSM8x60 SURF eval board.
126
127	config MACH_MSM8X60_SIM
128	depends on ARCH_MSM8X60
129	bool "MSM8x60 Simulator"
130	help
131	Support for the Qualcomm MSM8x60 simulator.
132
133	config MACH_MSM8X60_FFA
134	depends on ARCH_MSM8X60
135	bool "MSM8x60 FFA"
136	help
137	Support for the Qualcomm MSM8x60 FFA eval board.
138
139	config MACH_MSM8960_SIM
140	depends on ARCH_MSM8960
141	bool "MSM8960 Simulator"
142	help
143	Support for the Qualcomm MSM8960 simulator.
144
145	config MACH_MSM8960_RUMI3
146	depends on ARCH_MSM8960
147	bool "MSM8960 RUMI3"
148	help
149	Support for the Qualcomm MSM8960 RUMI3 emulator.
150
151	endmenu	114	endmenu
152		115
153	config MSM_SMD_PKG3	116	config MSM_SMD_PKG3