Skip to content

Commit

Permalink
ARM: shmobile: Introduce ARCH_RENESAS
Browse files Browse the repository at this point in the history
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: Simon Horman <horms+renesas@verge.net.au>
  • Loading branch information
Simon Horman committed Nov 16, 2015
1 parent 804b0d7 commit 9b5ba0d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion arch/arm/configs/multi_v7_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/configs/shmobile_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 7 additions & 3 deletions arch/arm/mach-shmobile/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
config ARCH_SHMOBILE
bool
select ZONE_DMA if ARM_LPAE

config ARCH_SHMOBILE_MULTI
bool

config PM_RCAR
bool
Expand Down Expand Up @@ -29,19 +31,21 @@ 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
select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
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"

Expand Down

0 comments on commit 9b5ba0d

Please sign in to comment.