Commit ea0aac1e authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Consolidate rsk7203/7201 in to a new mach-rsk. 



RSK+ platforms have quite a few characteristics in common, so roll them
together in to a shiny new RSK mach-type.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent b5cfeac9

arch/sh/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ machdir-$(CONFIG_SH_LANDISK) += mach-landisk 
machdir-$(CONFIG_SH_TITAN)			+= mach-titan

machdir-$(CONFIG_SH_LBOX_RE2)			+= mach-lboxre2

machdir-$(CONFIG_SH_CAYMAN)			+= mach-cayman

machdir-$(CONFIG_SH_RSK)			+= mach-rsk



ifneq ($(machdir-y),)

core-y	+= $(addprefix arch/sh/boards/, \

arch/sh/boards/Kconfig

+7 −8
Original line number Diff line number Diff line
@@ -126,14 +126,12 @@ config SH_RTS7751R2D 
	  Select RTS7751R2D if configuring for a Renesas Technology

	  Sales SH-Graphics board.



config SH_RSK7201

	bool "RSK7201"

	depends on CPU_SUBTYPE_SH7201



config SH_RSK7203

	bool "RSK7203"

	select GENERIC_GPIO

	depends on CPU_SUBTYPE_SH7203

config SH_RSK

	bool "Renesas Starter Kit"

	depends on CPU_SUBTYPE_SH7201 || CPU_SUBTYPE_SH7203

	help

	 Select this option if configuring for any of the RSK+ MCU

	 evaluation platforms.



config SH_SDK7780

	bool "SDK7780R3"
@@ -257,6 +255,7 @@ source "arch/sh/boards/mach-r2d/Kconfig" 
source "arch/sh/boards/mach-highlander/Kconfig"

source "arch/sh/boards/mach-sdk7780/Kconfig"

source "arch/sh/boards/mach-migor/Kconfig"

source "arch/sh/boards/mach-rsk/Kconfig"



if SH_MAGIC_PANEL_R2

arch/sh/boards/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 
#

obj-$(CONFIG_SH_AP325RXA)	+= board-ap325rxa.o

obj-$(CONFIG_SH_MAGIC_PANEL_R2)	+= board-magicpanelr2.o

obj-$(CONFIG_SH_RSK7201)	+= board-rsk7201.o

obj-$(CONFIG_SH_RSK7203)	+= board-rsk7203.o

obj-$(CONFIG_SH_SH7785LCR)	+= board-sh7785lcr.o

obj-$(CONFIG_SH_SHMIN)		+= board-shmin.o

obj-$(CONFIG_SH_EDOSK7760)	+= board-edosk7760.o

arch/sh/boards/mach-rsk/Kconfig

0 → 100644
+18 −0
Original line number Diff line number Diff line 
if SH_RSK



choice

	prompt "RSK+ options"

	default SH_RSK7203



config SH_RSK7201

	bool "RSK7201"

	depends on CPU_SUBTYPE_SH7201



config SH_RSK7203

	bool "RSK7203"

	select GENERIC_GPIO

	depends on CPU_SUBTYPE_SH7203



endchoice



endif

arch/sh/boards/mach-rsk/Makefile

0 → 100644
+2 −0
Original line number Diff line number Diff line 
obj-y				:= setup.o

obj-$(CONFIG_SH_RSK7203)	+= devices-rsk7203.o