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

Commit 0ed82bc9 authored by Magnus Damm's avatar Magnus Damm Committed by Simon Horman
Browse files

ARM: shmobile: Consolidate Legacy CPU_V7 Kconfig 



Consolidate CPU_V7 under ARCH_SHMOBILE_LEGACY so it can
be shared by the legacy ARM mach-shmobile support code.

Signed-off-by: default avatarMagnus Damm <damm+renesas@opensource.se>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 46bff9db

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -650,6 +650,7 @@ config ARCH_SHMOBILE_LEGACY 
	select ARCH_SHMOBILE

	select ARM_PATCH_PHYS_VIRT if MMU

	select CLKDEV_LOOKUP

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

arch/arm/mach-shmobile/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ config ARCH_SH7372 
	select ARCH_RMOBILE

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_CPU_SUSPEND if PM || CPU_IDLE

	select CPU_V7

	select SH_CLK_CPG

	select SH_INTC
@@ -104,7 +103,6 @@ config ARCH_SH73A0 
	select ARCH_RMOBILE

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_GIC

	select CPU_V7

	select I2C

	select SH_CLK_CPG

	select SH_INTC
@@ -115,7 +113,6 @@ config ARCH_R8A73A4 
	select ARCH_RMOBILE

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_GIC

	select CPU_V7

	select SH_CLK_CPG

	select RENESAS_IRQC
@@ -124,7 +121,6 @@ config ARCH_R8A7740 
	select ARCH_RMOBILE

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_GIC

	select CPU_V7

	select SH_CLK_CPG

	select RENESAS_INTC_IRQPIN
@@ -132,7 +128,6 @@ config ARCH_R8A7778 
	bool "R-Car M1A (R8A77781)"

	select ARCH_RCAR_GEN1

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select CPU_V7

	select SH_CLK_CPG

	select ARM_GIC
@@ -141,7 +136,6 @@ config ARCH_R8A7779 
	select ARCH_RCAR_GEN1

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_GIC

	select CPU_V7

	select SH_CLK_CPG



config ARCH_R8A7790
@@ -149,7 +143,6 @@ config ARCH_R8A7790 
	select ARCH_RCAR_GEN2

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_GIC

	select CPU_V7

	select MIGHT_HAVE_PCI

	select SH_CLK_CPG

	select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
@@ -159,7 +152,6 @@ config ARCH_R8A7791 
	select ARCH_RCAR_GEN2

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_GIC

	select CPU_V7

	select MIGHT_HAVE_PCI

	select SH_CLK_CPG

	select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE