lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ARM] msm: rename ARCH_MSM7X00A to ARCH_MSM

Browse Source 
The MSM architecture covers a wider family of chips than just the MSM7X00A.
Move to a more generic name, in perparation for supporting the specific
SoC variants as sub-architectures (ARCH_MSM7X01A, ARCH_MSM722X, etc).  This
gives us ARCH_MSM for the (many) common peripherals.

This also removes the unused/obsolete config item MSM7X00A_IDLE.

Signed-off-by: Brian Swetland <swetland@google.com>
This commit is contained in:
Brian Swetland
2008-09-09 07:13:33 -07:00
parent 2515ddc6db
commit 1637de0c9b
5 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/Kconfig
View File

@@ -540,16 +540,15 @@ config ARCH_OMAP
help help
Support for TI's OMAP platform (OMAP1 and OMAP2). Support for TI's OMAP platform (OMAP1 and OMAP2).
config ARCH_MSM7X00A config ARCH_MSM
bool "Qualcomm MSM7X00A" bool "Qualcomm MSM"
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
help help
Support for Qualcomm MSM7X00A based systems. This runs on the ARM11 Support for Qualcomm MSM7K based systems. This runs on the ARM11
apps processor of the MSM7X00A and depends on a shared memory apps processor of the MSM7K and depends on a shared memory
interface to the ARM9 modem processor which runs the baseband stack interface to the ARM9 modem processor which runs the baseband stack
and controls some vital subsystems (clock and power control, etc). and controls some vital subsystems (clock and power control, etc).
<http://www.cdmatech.com/products/msm7200_chipset_solution.jsp>
endchoice endchoice

2
arch/arm/Makefile
View File

@@ -141,7 +141,7 @@ endif
machine-$(CONFIG_ARCH_MX3) := mx3 machine-$(CONFIG_ARCH_MX3) := mx3
machine-$(CONFIG_ARCH_ORION5X) := orion5x machine-$(CONFIG_ARCH_ORION5X) := orion5x
plat-$(CONFIG_PLAT_ORION) := orion plat-$(CONFIG_PLAT_ORION) := orion
machine-$(CONFIG_ARCH_MSM7X00A) := msm machine-$(CONFIG_ARCH_MSM) := msm
machine-$(CONFIG_ARCH_LOKI) := loki machine-$(CONFIG_ARCH_LOKI) := loki
machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0

2
arch/arm/configs/msm_defconfig
View File

@@ -133,7 +133,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
# CONFIG_ARCH_LH7A40X is not set # CONFIG_ARCH_LH7A40X is not set
# CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_DAVINCI is not set
# CONFIG_ARCH_OMAP is not set # CONFIG_ARCH_OMAP is not set
CONFIG_ARCH_MSM7X00A=y CONFIG_ARCH_MSM=y
# #
# Boot options # Boot options

17
arch/arm/mach-msm/Kconfig
View File

@@ -1,18 +1,13 @@
if ARCH_MSM7X00A if ARCH_MSM
comment "MSM7X00A Board Type" comment "MSM Board Type"
depends on ARCH_MSM7X00A depends on ARCH_MSM
config MACH_HALIBUT config MACH_HALIBUT
depends on ARCH_MSM7X00A depends on ARCH_MSM
default y default y
bool "Halibut Board (QCT SURF7200A)" bool "Halibut Board (QCT SURF7201A)"
help help
Support for the Qualcomm SURF7200A eval board. Support for the Qualcomm SURF7201A eval board.
config MSM7X00A_IDLE
depends on ARCH_MSM7X00A
default y
bool "Idle Support for MSM7X00A"
endif endif

4
arch/arm/mm/Kconfig
View File

@@ -400,9 +400,9 @@ config CPU_FEROCEON_OLD_ID
# ARMv6 # ARMv6
config CPU_V6 config CPU_V6
bool "Support ARM V6 processor" bool "Support ARM V6 processor"
depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP2 || ARCH_MX3 || ARCH_MSM7X00A || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP2 || ARCH_MX3 || ARCH_MSM || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176
default y if ARCH_MX3 default y if ARCH_MX3
default y if ARCH_MSM7X00A default y if ARCH_MSM
select CPU_32v6 select CPU_32v6
select CPU_ABRT_EV6 select CPU_ABRT_EV6
select CPU_PABRT_NOIFAR select CPU_PABRT_NOIFAR