Skip to content

Commit

Permalink
sh: Remove SH5-based Cayman platform
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
geertu authored and Rich Felker committed Aug 15, 2020
1 parent 7dfaa9e commit 8a8e546
Show file tree
Hide file tree
Showing 11 changed files with 2 additions and 540 deletions.
5 changes: 2 additions & 3 deletions arch/sh/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ config ARCH_HAS_ILOG2_U64

config NO_IOPORT_MAP
def_bool !PCI
depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN && \
!SH_HP6XX && !SH_SOLUTION_ENGINE
depends on !SH_SH4202_MICRODEV && !SH_SHMIN && !SH_HP6XX && \
!SH_SOLUTION_ENGINE

config IO_TRAPPED
bool
Expand Down Expand Up @@ -726,7 +726,6 @@ config ZERO_PAGE_OFFSET
config BOOT_LINK_OFFSET
hex
default "0x00210000" if SH_SHMIN
default "0x00400000" if SH_CAYMAN
default "0x00810000" if SH_7780_SOLUTION_ENGINE
default "0x009e0000" if SH_TITAN
default "0x01800000" if SH_SDK7780
Expand Down
5 changes: 0 additions & 5 deletions arch/sh/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@ ifneq ($(SUBARCH),$(ARCH))
endif
endif

ifeq ($(ARCH),sh)
KBUILD_DEFCONFIG := shx3_defconfig
else
KBUILD_DEFCONFIG := cayman_defconfig
endif

isa-y := any
isa-$(CONFIG_SH_DSP) := sh
Expand Down Expand Up @@ -143,7 +139,6 @@ machdir-$(CONFIG_SH_SH7763RDP) += mach-sh7763rdp
machdir-$(CONFIG_SH_SH4202_MICRODEV) += mach-microdev
machdir-$(CONFIG_SH_LANDISK) += mach-landisk
machdir-$(CONFIG_SH_LBOX_RE2) += mach-lboxre2
machdir-$(CONFIG_SH_CAYMAN) += mach-cayman
machdir-$(CONFIG_SH_RSK) += mach-rsk

ifneq ($(machdir-y),)
Expand Down
6 changes: 0 additions & 6 deletions arch/sh/boards/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -340,12 +340,6 @@ config SH_MAGIC_PANEL_R2
help
Select Magic Panel R2 if configuring for Magic Panel R2.

config SH_CAYMAN
bool "Hitachi Cayman"
depends on CPU_SUBTYPE_SH5_101 || CPU_SUBTYPE_SH5_103
select HAVE_PCI
select ARCH_MIGHT_HAVE_PC_SERIO

config SH_POLARIS
bool "SMSC Polaris"
select CPU_HAS_IPR_IRQ
Expand Down
5 changes: 0 additions & 5 deletions arch/sh/boards/mach-cayman/Makefile

This file was deleted.

148 changes: 0 additions & 148 deletions arch/sh/boards/mach-cayman/irq.c

This file was deleted.

46 changes: 0 additions & 46 deletions arch/sh/boards/mach-cayman/panic.c

This file was deleted.

Loading

0 comments on commit 8a8e546

Please sign in to comment.