Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b5ba0df authored by Simon Horman's avatar Simon Horman
Browse files

ARM: shmobile: Introduce ARCH_RENESAS 



The purpose of this patch is to start the process of replacing both
ARCH_SHMOBILE and ARCH_SHMOBILE_MULTI with ARCH_RENESAS.

RENESAS seems to be a more appropriate name than SHMOBILE for the majority
of Renesas 32-bit ARM based SoCs. The name is conveniently also (newer)
ARM64 based SoCs.

This patches only addresses 32-bit ARM based SoCs.  Proposed support for
the ARM64 based r8a7795 SoC already uses ARCH_RENESAS which selects
ARCH_SHMOBILE.

Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 804b0d70

arch/arm/configs/multi_v7_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ CONFIG_MACH_SPEAR1340=y 
CONFIG_ARCH_STI=y

CONFIG_ARCH_EXYNOS=y

CONFIG_EXYNOS5420_MCPM=y

CONFIG_ARCH_SHMOBILE_MULTI=y

CONFIG_ARCH_RENESAS=y

CONFIG_ARCH_EMEV2=y

CONFIG_ARCH_R7S72100=y

CONFIG_ARCH_R8A73A4=y

arch/arm/configs/shmobile_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ CONFIG_SYSCTL_SYSCALL=y 
CONFIG_EMBEDDED=y

CONFIG_PERF_EVENTS=y

CONFIG_SLAB=y

CONFIG_ARCH_SHMOBILE_MULTI=y

CONFIG_ARCH_RENESAS=y

CONFIG_ARCH_EMEV2=y

CONFIG_ARCH_R7S72100=y

CONFIG_ARCH_R8A73A4=y

arch/arm/mach-shmobile/Kconfig

+7 −3
Original line number Diff line number Diff line 
config ARCH_SHMOBILE

	bool

	select ZONE_DMA if ARM_LPAE



config ARCH_SHMOBILE_MULTI

	bool



config PM_RCAR

	bool
@@ -29,10 +31,11 @@ config ARCH_RMOBILE 
	select SYS_SUPPORTS_SH_CMT

	select SYS_SUPPORTS_SH_TMU



menuconfig ARCH_SHMOBILE_MULTI

menuconfig ARCH_RENESAS

	bool "Renesas ARM SoCs" if ARCH_MULTI_V7

	depends on MMU

	select ARCH_SHMOBILE

	select ARCH_SHMOBILE_MULTI

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select ARM_GIC
@@ -40,8 +43,9 @@ menuconfig ARCH_SHMOBILE_MULTI 
	select NO_IOPORT_MAP

	select PINCTRL

	select ARCH_REQUIRE_GPIOLIB

	select ZONE_DMA if ARM_LPAE



if ARCH_SHMOBILE_MULTI

if ARCH_RENESAS



#comment "Renesas ARM SoCs System Type"