Merge "Kconfig: Add CONFIG_MSM_CORTEX" (c21c3baf) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/mach-msm/Kconfig

+6 −0

Original line number	Diff line number	Diff line
		@@ -144,6 +144,7 @@ config ARCH_MSMKRYPTON
		select MEMORY_HOLE_CARVEOUT
		select QMI_ENCDEC
		select MSM_JTAG_MM if CORESIGHT_ETM
		select MSM_CORTEX_A7

		config ARCH_MSM8610
		bool "MSM8610"
		@@ -171,6 +172,7 @@ config ARCH_MSM8610
		select MSM_PM8X60 if PM
		select MEMORY_HOLE_CARVEOUT
		select MSM_BUS_SCALING
		select MSM_CORTEX_A7
		select CPU_FREQ_MSM
		select CPU_FREQ
		select MSM_PIL
		@@ -214,6 +216,7 @@ config ARCH_MSM8226
		select MSM_PM8X60 if PM
		select MEMORY_HOLE_CARVEOUT
		select MSM_BUS_SCALING
		select MSM_CORTEX_A7
		select CPU_FREQ_MSM
		select CPU_FREQ
		select MSM_PIL
		@@ -280,6 +283,9 @@ config ARCH_MSM_KRAIT
		bool
		select ARM_L1_CACHE_SHIFT_6

		config MSM_CORTEX_A7
		bool

		config MSM_SMP
		select HAVE_SMP
		bool

+2 −1

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@ obj-$(CONFIG_KEXEC) += msm_kexec.o

		obj-y += acpuclock.o
		obj-$(CONFIG_ARCH_MSM_KRAIT) += clock-krait.o
		obj-$(CONFIG_MSM_CORTEX_A7) += clock-a7.o
		obj-$(CONFIG_HW_PERF_EVENTS) += perf_trace_counters.o
		obj-$(CONFIG_ARCH_MSM_KRAIT) += msm-krait-l2-accessors.o perf_event_msm_krait_l2.o
		obj-$(CONFIG_ARCH_MSM_KRAIT) += krait-scm.o
		@@ -149,7 +150,7 @@ obj-$(CONFIG_ARCH_MSM8610) += clock-local2.o clock-pll.o clock-8610.o clock-rpm.
		obj-$(CONFIG_ARCH_MSM8610) += acpuclock-8226.o acpuclock-cortex.o
		obj-$(CONFIG_ARCH_MSM8610) += clock-dsi-8610.o
		obj-$(CONFIG_ARCH_MSMKRYPTON) += clock-local2.o clock-pll.o clock-krypton.o clock-rpm.o clock-voter.o
		obj-$(CONFIG_ARCH_MSMKRYPTON) += clock-alpha-pll.o clock-a7.o
		obj-$(CONFIG_ARCH_MSMKRYPTON) += clock-alpha-pll.o

		obj-$(CONFIG_MSM_PM8X60) += pm-8x60.o pm-data.o