arm: msm: allow ARCH_MSM to have v7 cpus

ARCH_MSM supports armv7 cpus, so we're pushed the CPU_V6/CPU_V7 selection
down into the arch/arm/mach-msm/Kconfig.

Also update the description to be a bit more accurate.

Signed-off-by: Daniel Walker <dwalker@codeaurora.org>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 92622eb5cc0da6f651c31cdaf0ff55f8bba16977..9264d0176c3b85a3ba7a0c11db6e629073dc075b 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -601,14 +601,14 @@ config ARCH_PXA
 
 config ARCH_MSM
        bool "Qualcomm MSM"
-       select CPU_V6
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        help
-         Support for Qualcomm MSM7K based systems.  This runs on the ARM11
-         apps processor of the MSM7K and depends on a shared memory
-         interface to the ARM9 modem processor which runs the baseband stack
-         and controls some vital subsystems (clock and power control, etc).
+         Support for Qualcomm MSM/QSD based systems.  This runs on the
+         apps processor of the MSM/QSD and depends on a shared memory
+         interface to the modem processor which runs the baseband
+         stack and controls some vital subsystems
+         (clock and power control, etc).
 
 config ARCH_SHMOBILE
        bool "Renesas SH-Mobile"

diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index f780086befd78697d16da2654758270dd75bd1d6..b9fd5c528e5b35743e60087f5cd104b12d00a4d4 100644 (file)
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -29,12 +29,14 @@ 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 MACH_TROUT
+       select CPU_V6
        default y
        bool "HTC Dream (aka trout)"
        help