Skip to content

Commit 8a8e546

Browse files
geertuRich Felker
authored andcommitted
sh: Remove SH5-based Cayman platform
Since the removal of core support for SH5, Cayman support can no longer be selected. Fixes: 37744fe ("sh: remove sh5 support") Signed-off-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Rich Felker <[email protected]>
1 parent 7dfaa9e commit 8a8e546

File tree

11 files changed

+2
-540
lines changed

11 files changed

+2
-540
lines changed

arch/sh/Kconfig

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ config ARCH_HAS_ILOG2_U64
123123

124124
config NO_IOPORT_MAP
125125
def_bool !PCI
126-
depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN && \
127-
!SH_HP6XX && !SH_SOLUTION_ENGINE
126+
depends on !SH_SH4202_MICRODEV && !SH_SHMIN && !SH_HP6XX && \
127+
!SH_SOLUTION_ENGINE
128128

129129
config IO_TRAPPED
130130
bool
@@ -726,7 +726,6 @@ config ZERO_PAGE_OFFSET
726726
config BOOT_LINK_OFFSET
727727
hex
728728
default "0x00210000" if SH_SHMIN
729-
default "0x00400000" if SH_CAYMAN
730729
default "0x00810000" if SH_7780_SOLUTION_ENGINE
731730
default "0x009e0000" if SH_TITAN
732731
default "0x01800000" if SH_SDK7780

arch/sh/Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@ ifneq ($(SUBARCH),$(ARCH))
1515
endif
1616
endif
1717

18-
ifeq ($(ARCH),sh)
1918
KBUILD_DEFCONFIG := shx3_defconfig
20-
else
21-
KBUILD_DEFCONFIG := cayman_defconfig
22-
endif
2319

2420
isa-y := any
2521
isa-$(CONFIG_SH_DSP) := sh
@@ -143,7 +139,6 @@ machdir-$(CONFIG_SH_SH7763RDP) += mach-sh7763rdp
143139
machdir-$(CONFIG_SH_SH4202_MICRODEV) += mach-microdev
144140
machdir-$(CONFIG_SH_LANDISK) += mach-landisk
145141
machdir-$(CONFIG_SH_LBOX_RE2) += mach-lboxre2
146-
machdir-$(CONFIG_SH_CAYMAN) += mach-cayman
147142
machdir-$(CONFIG_SH_RSK) += mach-rsk
148143

149144
ifneq ($(machdir-y),)

arch/sh/boards/Kconfig

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -340,12 +340,6 @@ config SH_MAGIC_PANEL_R2
340340
help
341341
Select Magic Panel R2 if configuring for Magic Panel R2.
342342

343-
config SH_CAYMAN
344-
bool "Hitachi Cayman"
345-
depends on CPU_SUBTYPE_SH5_101 || CPU_SUBTYPE_SH5_103
346-
select HAVE_PCI
347-
select ARCH_MIGHT_HAVE_PC_SERIO
348-
349343
config SH_POLARIS
350344
bool "SMSC Polaris"
351345
select CPU_HAS_IPR_IRQ

arch/sh/boards/mach-cayman/Makefile

Lines changed: 0 additions & 5 deletions
This file was deleted.

arch/sh/boards/mach-cayman/irq.c

Lines changed: 0 additions & 148 deletions
This file was deleted.

arch/sh/boards/mach-cayman/panic.c

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)