Commit bf98c1ea authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Simon Horman
Browse files

ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY 



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: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent cf4f85cc

arch/arm/Kconfig

+8 −6
Original line number Diff line number Diff line
@@ -644,8 +644,9 @@ config ARCH_MSM 
	  stack and controls some vital subsystems

	  (clock and power control, etc).



config ARCH_SHMOBILE

	bool "Renesas SH-Mobile / R-Mobile"

config ARCH_SHMOBILE_LEGACY

	bool "Renesas SH-Mobile / R-Mobile (non-multiplatform)"

	select ARCH_SHMOBILE

	select ARM_PATCH_PHYS_VIRT

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS
@@ -660,7 +661,8 @@ config ARCH_SHMOBILE 
	select PM_GENERIC_DOMAINS if PM

	select SPARSE_IRQ

	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

	bool "RiscPC"
@@ -1611,7 +1613,7 @@ config HZ_FIXED 
	default 200 if ARCH_EBSA110 || ARCH_S3C24XX || ARCH_S5P64X0 || \

		ARCH_S5PV210 || ARCH_EXYNOS4

	default AT91_TIMER_HZ if ARCH_AT91

	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE

	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE_LEGACY

	default 0



choice
@@ -1796,8 +1798,8 @@ config ARCH_WANT_GENERAL_HUGETLB 
source "mm/Kconfig"



config FORCE_MAX_ZONEORDER

	int "Maximum zone order" if ARCH_SHMOBILE

	range 11 64 if ARCH_SHMOBILE

	int "Maximum zone order" if ARCH_SHMOBILE_LEGACY

	range 11 64 if ARCH_SHMOBILE_LEGACY

	default "12" if SOC_AM33XX

	default "9" if SA1111

	default "11"

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ machine-$(CONFIG_ARCH_S5PC100) += s5pc100 
machine-$(CONFIG_ARCH_S5PV210)		+= s5pv210

machine-$(CONFIG_ARCH_SA1100)		+= sa1100

machine-$(CONFIG_ARCH_SHMOBILE) 	+= shmobile

machine-$(CONFIG_ARCH_SHMOBILE_MULTI) 	+= shmobile

machine-$(CONFIG_ARCH_SIRF)		+= prima2

machine-$(CONFIG_ARCH_SOCFPGA)		+= socfpga

machine-$(CONFIG_ARCH_STI)		+= sti

arch/arm/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ else 
endif

endif



ifeq ($(CONFIG_ARCH_SHMOBILE),y)

ifeq ($(CONFIG_ARCH_SHMOBILE_LEGACY),y)

OBJS		+= head-shmobile.o

endif

arch/arm/boot/dts/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \ 
dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb

dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \

	s3c6410-smdk6410.dtb

dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \

dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \

	r7s72100-genmai.dtb \

	r8a7740-armadillo800eva.dtb \

	r8a7778-bockw.dtb \

arch/arm/configs/ape6evm_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ CONFIG_EMBEDDED=y 
CONFIG_PERF_EVENTS=y

CONFIG_SLAB=y

# CONFIG_BLOCK is not set

CONFIG_ARCH_SHMOBILE=y

CONFIG_ARCH_SHMOBILE_LEGACY=y

CONFIG_ARCH_R8A73A4=y

CONFIG_MACH_APE6EVM=y

# CONFIG_ARM_THUMB is not set

CRA Git | Maintained and supported by SUSTech CRA and CCSE