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

Commit 36d6c928 authored by Ulrich Hecht's avatar Ulrich Hecht Committed by Simon Horman
Browse files

ARM: shmobile: remove ARCH_SHMOBILE_LEGACY option 



With Bock-W, the last legacy platform has been removed.

Signed-off-by: default avatarUlrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: default avatarby: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 51e47a38

arch/arm/Kconfig

+1 −25
Original line number Diff line number Diff line
@@ -621,28 +621,6 @@ config ARCH_PXA 
	help

	  Support for Intel/Marvell's PXA2xx/PXA3xx processor line.



config ARCH_SHMOBILE_LEGACY

	bool "Renesas ARM SoCs (non-multiplatform)"

	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

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	select MULTI_IRQ_HANDLER

	select NO_IOPORT_MAP

	select PINCTRL

	select PM_GENERIC_DOMAINS if PM

	select SH_CLK_CPG

	select SPARSE_IRQ

	help

	  Support for Renesas ARM SoC platforms using a non-multiplatform

	  kernel. This includes the SH-Mobile, R-Mobile, EMMA-Mobile, R-Car

	  and RZ families.



config ARCH_RPC

	bool "RiscPC"

	select ARCH_ACORN
@@ -1534,7 +1512,6 @@ config HZ_FIXED 
	default 200 if ARCH_EBSA110 || ARCH_S3C24XX || \

		ARCH_S5PV210 || ARCH_EXYNOS4

	default 128 if SOC_AT91RM9200

	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE_LEGACY

	default 0



choice
@@ -1752,8 +1729,7 @@ config ARM_MODULE_PLTS 
source "mm/Kconfig"



config FORCE_MAX_ZONEORDER

	int "Maximum zone order" if ARCH_SHMOBILE_LEGACY

	range 11 64 if ARCH_SHMOBILE_LEGACY

	int "Maximum zone order"

	default "12" if SOC_AM33XX

	default "9" if SA1111 || ARCH_EFM32

	default "11"

arch/arm/Kconfig.debug

+1 −2
Original line number Diff line number Diff line
@@ -1621,8 +1621,7 @@ config DEBUG_UNCOMPRESS 
config UNCOMPRESS_INCLUDE

	string

	default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \

					PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \

					ARCH_SHMOBILE_LEGACY

					PLAT_SAMSUNG || ARM_SINGLE_ARMV7M

	default "mach/uncompress.h"



config EARLY_PRINTK

arch/arm/mach-shmobile/Kconfig

+0 −23
Original line number Diff line number Diff line
@@ -99,29 +99,6 @@ config ARCH_SH73A0 
comment "Renesas ARM SoCs System Configuration"

endif



if ARCH_SHMOBILE_LEGACY



comment "Renesas ARM SoCs System Type"



config ARCH_R8A7779

	bool "R-Car H1 (R8A77790)"

	select ARCH_RCAR_GEN1

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_GIC



comment "Renesas ARM SoCs System Configuration"



config CPU_HAS_INTEVT

        bool

	default y



config SH_CLK_CPG

	bool



source "drivers/sh/Kconfig"



endif



if ARCH_SHMOBILE



menu "Timer and clock configuration"