iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY

Browse Source 
SH-Mobile platforms are transitioning from non-multiplatform to
multiplatform kernel. A new ARCH_SHMOBILE_MULTI configuration symbol has
been created to group all multiplatform-enabled SH-Mobile SoCs. The
existing ARCH_SHMOBILE configuration symbol groups SoCs that haven't
been converted yet.

This arrangement works fine for the arch/ code, but lots of drivers
needed on both ARCH_SHMOBILE and ARCH_SHMOBILE_MULTI depend on
ARCH_SHMOBILE only. In order to avoid changing them, rename
ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY, and create a new boolean
ARCH_SHMOBILE configuration symbol that is selected by both
ARCH_SHMOBILE_LEGACY and ARCH_SHMOBILE_MULTI.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This commit is contained in:
Laurent Pinchart 2013-11-09 13:33:48 +01:00 committed by Simon Horman
parent cf4f85ccd5
commit bf98c1eac1
15 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/Kconfig
View File

@ -644,8 +644,9 @@ config ARCH_MSM
stack and controls some vital subsystems stack and controls some vital subsystems
(clock and power control, etc). (clock and power control, etc).
config ARCH_SHMOBILE config ARCH_SHMOBILE_LEGACY
bool "Renesas SH-Mobile / R-Mobile" bool "Renesas SH-Mobile / R-Mobile (non-multiplatform)"
select ARCH_SHMOBILE
select ARM_PATCH_PHYS_VIRT select ARM_PATCH_PHYS_VIRT
select CLKDEV_LOOKUP select CLKDEV_LOOKUP
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
@ -660,7 +661,8 @@ config ARCH_SHMOBILE
select PM_GENERIC_DOMAINS if PM select PM_GENERIC_DOMAINS if PM
select SPARSE_IRQ select SPARSE_IRQ
help help
Support for Renesas's SH-Mobile and R-Mobile ARM platforms. Support for Renesas's SH-Mobile and R-Mobile ARM platforms using
a non-multiplatform kernel.
config ARCH_RPC config ARCH_RPC
bool "RiscPC" bool "RiscPC"
@ -1611,7 +1613,7 @@ config HZ_FIXED
default 200 if ARCH_EBSA110 || ARCH_S3C24XX || ARCH_S5P64X0 || \ default 200 if ARCH_EBSA110 || ARCH_S3C24XX || ARCH_S5P64X0 || \
ARCH_S5PV210 || ARCH_EXYNOS4 ARCH_S5PV210 || ARCH_EXYNOS4
default AT91_TIMER_HZ if ARCH_AT91 default AT91_TIMER_HZ if ARCH_AT91
default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE_LEGACY
default 0 default 0
choice choice
@ -1796,8 +1798,8 @@ config ARCH_WANT_GENERAL_HUGETLB
source "mm/Kconfig" source "mm/Kconfig"
config FORCE_MAX_ZONEORDER config FORCE_MAX_ZONEORDER
int "Maximum zone order" if ARCH_SHMOBILE int "Maximum zone order" if ARCH_SHMOBILE_LEGACY
range 11 64 if ARCH_SHMOBILE range 11 64 if ARCH_SHMOBILE_LEGACY
default "12" if SOC_AM33XX default "12" if SOC_AM33XX
default "9" if SA1111 default "9" if SA1111
default "11" default "11"

1
arch/arm/Makefile
View File

@ -190,7 +190,6 @@ machine-$(CONFIG_ARCH_S5PC100) += s5pc100
machine-$(CONFIG_ARCH_S5PV210) += s5pv210 machine-$(CONFIG_ARCH_S5PV210) += s5pv210
machine-$(CONFIG_ARCH_SA1100) += sa1100 machine-$(CONFIG_ARCH_SA1100) += sa1100
machine-$(CONFIG_ARCH_SHMOBILE) += shmobile machine-$(CONFIG_ARCH_SHMOBILE) += shmobile
machine-$(CONFIG_ARCH_SHMOBILE_MULTI) += shmobile
machine-$(CONFIG_ARCH_SIRF) += prima2 machine-$(CONFIG_ARCH_SIRF) += prima2
machine-$(CONFIG_ARCH_SOCFPGA) += socfpga machine-$(CONFIG_ARCH_SOCFPGA) += socfpga
machine-$(CONFIG_ARCH_STI) += sti machine-$(CONFIG_ARCH_STI) += sti

2
arch/arm/boot/compressed/Makefile
View File

@ -64,7 +64,7 @@ else
endif endif
endif endif
ifeq ($(CONFIG_ARCH_SHMOBILE),y) ifeq ($(CONFIG_ARCH_SHMOBILE_LEGACY),y)
OBJS += head-shmobile.o OBJS += head-shmobile.o
endif endif

2
arch/arm/boot/dts/Makefile
View File

@ -216,7 +216,7 @@ dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \ dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \
s3c6410-smdk6410.dtb s3c6410-smdk6410.dtb
dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \
r7s72100-genmai.dtb \ r7s72100-genmai.dtb \
r8a7740-armadillo800eva.dtb \ r8a7740-armadillo800eva.dtb \
r8a7778-bockw.dtb \ r8a7778-bockw.dtb \

2
arch/arm/configs/ape6evm_defconfig
View File

@ -13,7 +13,7 @@ CONFIG_EMBEDDED=y
CONFIG_PERF_EVENTS=y CONFIG_PERF_EVENTS=y
CONFIG_SLAB=y CONFIG_SLAB=y
# CONFIG_BLOCK is not set # CONFIG_BLOCK is not set
CONFIG_ARCH_SHMOBILE=y CONFIG_ARCH_SHMOBILE_LEGACY=y
CONFIG_ARCH_R8A73A4=y CONFIG_ARCH_R8A73A4=y
CONFIG_MACH_APE6EVM=y CONFIG_MACH_APE6EVM=y
# CONFIG_ARM_THUMB is not set # CONFIG_ARM_THUMB is not set

2
arch/arm/configs/armadillo800eva_defconfig
View File

@ -15,7 +15,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSG is not set
# CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ is not set # CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_SHMOBILE=y CONFIG_ARCH_SHMOBILE_LEGACY=y
CONFIG_ARCH_R8A7740=y CONFIG_ARCH_R8A7740=y
CONFIG_MACH_ARMADILLO800EVA=y CONFIG_MACH_ARMADILLO800EVA=y
# CONFIG_SH_TIMER_TMU is not set # CONFIG_SH_TIMER_TMU is not set

2
arch/arm/configs/bockw_defconfig
View File

@ -8,7 +8,7 @@ CONFIG_SYSCTL_SYSCALL=y
CONFIG_EMBEDDED=y CONFIG_EMBEDDED=y
CONFIG_SLAB=y CONFIG_SLAB=y
# CONFIG_IOSCHED_CFQ is not set # CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_SHMOBILE=y CONFIG_ARCH_SHMOBILE_LEGACY=y
CONFIG_ARCH_R8A7778=y CONFIG_ARCH_R8A7778=y
CONFIG_MACH_BOCKW=y CONFIG_MACH_BOCKW=y
CONFIG_MEMORY_START=0x60000000 CONFIG_MEMORY_START=0x60000000

2
arch/arm/configs/koelsch_defconfig
View File

@ -9,7 +9,7 @@ CONFIG_EMBEDDED=y
CONFIG_PERF_EVENTS=y CONFIG_PERF_EVENTS=y
CONFIG_SLAB=y CONFIG_SLAB=y
# CONFIG_BLOCK is not set # CONFIG_BLOCK is not set
CONFIG_ARCH_SHMOBILE=y CONFIG_ARCH_SHMOBILE_LEGACY=y
CONFIG_ARCH_R8A7791=y CONFIG_ARCH_R8A7791=y
CONFIG_MACH_KOELSCH=y CONFIG_MACH_KOELSCH=y
# CONFIG_SWP_EMULATE is not set # CONFIG_SWP_EMULATE is not set

2
arch/arm/configs/kzm9d_defconfig
View File

@ -13,7 +13,7 @@ CONFIG_SLAB=y
# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSG is not set
# CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ is not set # CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_SHMOBILE=y CONFIG_ARCH_SHMOBILE_LEGACY=y
CONFIG_ARCH_EMEV2=y CONFIG_ARCH_EMEV2=y
CONFIG_MACH_KZM9D=y CONFIG_MACH_KZM9D=y
CONFIG_MEMORY_START=0x40000000 CONFIG_MEMORY_START=0x40000000

2
arch/arm/configs/kzm9g_defconfig
View File

@ -22,7 +22,7 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSG is not set
# CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ is not set # CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_SHMOBILE=y CONFIG_ARCH_SHMOBILE_LEGACY=y
CONFIG_ARCH_SH73A0=y CONFIG_ARCH_SH73A0=y
CONFIG_MACH_KZM9G=y CONFIG_MACH_KZM9G=y
CONFIG_MEMORY_START=0x41000000 CONFIG_MEMORY_START=0x41000000

2
arch/arm/configs/lager_defconfig
View File

@ -12,7 +12,7 @@ CONFIG_SLAB=y
# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSG is not set
# CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ is not set # CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_SHMOBILE=y CONFIG_ARCH_SHMOBILE_LEGACY=y
CONFIG_ARCH_R8A7790=y CONFIG_ARCH_R8A7790=y
CONFIG_MACH_LAGER=y CONFIG_MACH_LAGER=y
# CONFIG_SH_TIMER_TMU is not set # CONFIG_SH_TIMER_TMU is not set

2
arch/arm/configs/mackerel_defconfig
View File

@ -14,7 +14,7 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSG is not set
# CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ is not set # CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_SHMOBILE=y CONFIG_ARCH_SHMOBILE_LEGACY=y
CONFIG_ARCH_SH7372=y CONFIG_ARCH_SH7372=y
CONFIG_MACH_MACKEREL=y CONFIG_MACH_MACKEREL=y
CONFIG_MEMORY_SIZE=0x10000000 CONFIG_MEMORY_SIZE=0x10000000

2
arch/arm/configs/marzen_defconfig
View File

@ -9,7 +9,7 @@ CONFIG_SYSCTL_SYSCALL=y
CONFIG_EMBEDDED=y CONFIG_EMBEDDED=y
CONFIG_SLAB=y CONFIG_SLAB=y
# CONFIG_IOSCHED_CFQ is not set # CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_SHMOBILE=y CONFIG_ARCH_SHMOBILE_LEGACY=y
CONFIG_ARCH_R8A7779=y CONFIG_ARCH_R8A7779=y
CONFIG_MACH_MARZEN=y CONFIG_MACH_MARZEN=y
CONFIG_MEMORY_START=0x60000000 CONFIG_MEMORY_START=0x60000000

8
arch/arm/mach-shmobile/Kconfig
View File

@ -1,6 +1,10 @@
config ARCH_SHMOBILE
bool
config ARCH_SHMOBILE_MULTI config ARCH_SHMOBILE_MULTI
bool "SH-Mobile Series" if ARCH_MULTI_V7 bool "SH-Mobile Series" if ARCH_MULTI_V7
depends on MMU depends on MMU
select ARCH_SHMOBILE
select CPU_V7 select CPU_V7
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
@ -30,7 +34,7 @@ config MACH_KZM9D
comment "SH-Mobile System Configuration" comment "SH-Mobile System Configuration"
endif endif
if ARCH_SHMOBILE if ARCH_SHMOBILE_LEGACY
comment "SH-Mobile System Type" comment "SH-Mobile System Type"
@ -272,7 +276,7 @@ source "drivers/sh/Kconfig"
endif endif
if ARCH_SHMOBILE || ARCH_SHMOBILE_MULTI if ARCH_SHMOBILE
menu "Timer and clock configuration" menu "Timer and clock configuration"

2
drivers/Makefile
View File

@ -118,7 +118,7 @@ obj-$(CONFIG_SGI_SN) += sn/
obj-y += firmware/ obj-y += firmware/
obj-$(CONFIG_CRYPTO) += crypto/ obj-$(CONFIG_CRYPTO) += crypto/
obj-$(CONFIG_SUPERH) += sh/ obj-$(CONFIG_SUPERH) += sh/
obj-$(CONFIG_ARCH_SHMOBILE) += sh/ obj-$(CONFIG_ARCH_SHMOBILE_LEGACY) += sh/
ifndef CONFIG_ARCH_USES_GETTIMEOFFSET ifndef CONFIG_ARCH_USES_GETTIMEOFFSET
obj-y += clocksource/ obj-y += clocksource/
endif endif