Skip to content

Commit 37744fe

Browse files
arndbRich Felker
arndb
authored and
Rich Felker
committed
sh: remove sh5 support
sh5 never became a product and has probably never really worked. Remove it by recursively deleting all associated Kconfig options and all corresponding files. Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Rich Felker <dalias@libc.org>
1 parent d1f56f3 commit 37744fe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+67
-11554
lines changed

‎arch/sh/Kconfig

+10-52
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,6 @@ config SUPERH
5454
select HAVE_NMI
5555
select NEED_SG_DMA_LENGTH
5656
select ARCH_HAS_GIGANTIC_PAGE
57-
58-
help
59-
The SuperH is a RISC processor targeted for use in embedded systems
60-
and consumer electronics; it was also used in the Sega Dreamcast
61-
gaming console. The SuperH port has a home page at
62-
<http://www.linux-sh.org/>.
63-
64-
config SUPERH32
65-
def_bool "$(ARCH)" = "sh"
6657
select ARCH_32BIT_OFF_T
6758
select GUP_GET_PTE_LOW_HIGH if X2TLB
6859
select HAVE_KPROBES
@@ -81,19 +72,15 @@ config SUPERH32
8172
select ARCH_HIBERNATION_POSSIBLE if MMU
8273
select SPARSE_IRQ
8374
select HAVE_STACKPROTECTOR
84-
85-
config SUPERH64
86-
def_bool "$(ARCH)" = "sh64"
87-
select HAVE_EXIT_THREAD
88-
select KALLSYMS
75+
help
76+
The SuperH is a RISC processor targeted for use in embedded systems
77+
and consumer electronics; it was also used in the Sega Dreamcast
78+
gaming console. The SuperH port has a home page at
79+
<http://www.linux-sh.org/>.
8980

9081
config GENERIC_BUG
9182
def_bool y
92-
depends on BUG && SUPERH32
93-
94-
config GENERIC_CSUM
95-
def_bool y
96-
depends on SUPERH64
83+
depends on BUG
9784

9885
config GENERIC_HWEIGHT
9986
def_bool y
@@ -203,12 +190,6 @@ config CPU_SH4AL_DSP
203190
select CPU_SH4A
204191
select CPU_HAS_DSP
205192

206-
config CPU_SH5
207-
bool
208-
select CPU_HAS_FPU
209-
select SYS_SUPPORTS_SH_TMU
210-
select SYS_SUPPORTS_HUGETLBFS if MMU
211-
212193
config CPU_SHX2
213194
bool
214195

@@ -228,8 +209,6 @@ config CPU_HAS_PMU
228209
default y
229210
bool
230211

231-
if SUPERH32
232-
233212
choice
234213
prompt "Processor sub-type selection"
235214

@@ -518,27 +497,6 @@ config CPU_SUBTYPE_SH7366
518497

519498
endchoice
520499

521-
endif
522-
523-
if SUPERH64
524-
525-
choice
526-
prompt "Processor sub-type selection"
527-
528-
# SH-5 Processor Support
529-
530-
config CPU_SUBTYPE_SH5_101
531-
bool "Support SH5-101 processor"
532-
select CPU_SH5
533-
534-
config CPU_SUBTYPE_SH5_103
535-
bool "Support SH5-103 processor"
536-
select CPU_SH5
537-
538-
endchoice
539-
540-
endif
541-
542500
source "arch/sh/mm/Kconfig"
543501

544502
source "arch/sh/Kconfig.cpu"
@@ -592,7 +550,7 @@ source "kernel/Kconfig.hz"
592550

593551
config KEXEC
594552
bool "kexec system call (EXPERIMENTAL)"
595-
depends on SUPERH32 && MMU
553+
depends on MMU
596554
select KEXEC_CORE
597555
help
598556
kexec is a system call that implements the ability to shutdown your
@@ -610,7 +568,7 @@ config KEXEC
610568

611569
config CRASH_DUMP
612570
bool "kernel crash dumps (EXPERIMENTAL)"
613-
depends on SUPERH32 && BROKEN_ON_SMP
571+
depends on BROKEN_ON_SMP
614572
help
615573
Generate crash dump after being started by kexec.
616574
This should be normally only set in special crash dump kernels
@@ -624,7 +582,7 @@ config CRASH_DUMP
624582

625583
config KEXEC_JUMP
626584
bool "kexec jump (EXPERIMENTAL)"
627-
depends on SUPERH32 && KEXEC && HIBERNATION
585+
depends on KEXEC && HIBERNATION
628586
help
629587
Jump between original kernel and kexeced kernel and invoke
630588
code via KEXEC
@@ -701,7 +659,7 @@ config HOTPLUG_CPU
701659

702660
config GUSA
703661
def_bool y
704-
depends on !SMP && SUPERH32
662+
depends on !SMP
705663
help
706664
This enables support for gUSA (general UserSpace Atomicity).
707665
This is the default implementation for both UP and non-ll/sc

‎arch/sh/Kconfig.cpu

-9
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ config CPU_LITTLE_ENDIAN
1313

1414
config CPU_BIG_ENDIAN
1515
bool "Big Endian"
16-
depends on !CPU_SH5
1716

1817
endchoice
1918

@@ -27,10 +26,6 @@ config SH_FPU
2726

2827
This option must be set in order to enable the FPU.
2928

30-
config SH64_FPU_DENORM_FLUSH
31-
bool "Flush floating point denorms to zero"
32-
depends on SH_FPU && SUPERH64
33-
3429
config SH_FPU_EMU
3530
def_bool n
3631
prompt "FPU emulation support"
@@ -77,10 +72,6 @@ config SPECULATIVE_EXECUTION
7772

7873
If unsure, say N.
7974

80-
config SH64_ID2815_WORKAROUND
81-
bool "Include workaround for SH5-101 cut2 silicon defect ID2815"
82-
depends on CPU_SUBTYPE_SH5_101
83-
8475
config CPU_HAS_INTEVT
8576
bool
8677

‎arch/sh/Kconfig.debug

+3-10
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ config TRACE_IRQFLAGS_SUPPORT
55

66
config SH_STANDARD_BIOS
77
bool "Use LinuxSH standard BIOS"
8-
depends on SUPERH32
98
help
109
Say Y here if your target has the gdb-sh-stub
1110
package from www.m17n.org (or any conforming standard LinuxSH BIOS)
@@ -19,7 +18,7 @@ config SH_STANDARD_BIOS
1918

2019
config STACK_DEBUG
2120
bool "Check for stack overflows"
22-
depends on DEBUG_KERNEL && SUPERH32
21+
depends on DEBUG_KERNEL
2322
help
2423
This option will cause messages to be printed if free stack space
2524
drops below a certain limit. Saying Y here will add overhead to
@@ -38,15 +37,15 @@ config 4KSTACKS
3837

3938
config IRQSTACKS
4039
bool "Use separate kernel stacks when processing interrupts"
41-
depends on DEBUG_KERNEL && SUPERH32 && BROKEN
40+
depends on DEBUG_KERNEL && BROKEN
4241
help
4342
If you say Y here the kernel will use separate kernel stacks
4443
for handling hard and soft interrupts. This can help avoid
4544
overflowing the process kernel stacks.
4645

4746
config DUMP_CODE
4847
bool "Show disassembly of nearby code in register dumps"
49-
depends on DEBUG_KERNEL && SUPERH32
48+
depends on DEBUG_KERNEL
5049
default y if DEBUG_BUGVERBOSE
5150
default n
5251
help
@@ -59,7 +58,6 @@ config DUMP_CODE
5958
config DWARF_UNWINDER
6059
bool "Enable the DWARF unwinder for stacktraces"
6160
select FRAME_POINTER
62-
depends on SUPERH32
6361
default n
6462
help
6563
Enabling this option will make stacktraces more accurate, at
@@ -77,11 +75,6 @@ config SH_NO_BSS_INIT
7775
For all other cases, say N. If this option seems perplexing, or
7876
you aren't sure, say N.
7977

80-
config SH64_SR_WATCH
81-
bool "Debug: set SR.WATCH to enable hardware watchpoints and trace"
82-
depends on SUPERH64
83-
8478
config MCOUNT
8579
def_bool y
86-
depends on SUPERH32
8780
depends on STACK_DEBUG || FUNCTION_TRACER

‎arch/sh/Makefile

+7-22
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#
1212
ifneq ($(SUBARCH),$(ARCH))
1313
ifeq ($(CROSS_COMPILE),)
14-
CROSS_COMPILE := $(call cc-cross-prefix, $(UTS_MACHINE)-linux- $(UTS_MACHINE)-linux-gnu- $(UTS_MACHINE)-unknown-linux-gnu-)
14+
CROSS_COMPILE := $(call cc-cross-prefix, sh-linux- sh-linux-gnu- sh-unknown-linux-gnu-)
1515
endif
1616
endif
1717

@@ -29,12 +29,9 @@ isa-$(CONFIG_CPU_SH3) := sh3
2929
isa-$(CONFIG_CPU_SH4) := sh4
3030
isa-$(CONFIG_CPU_SH4A) := sh4a
3131
isa-$(CONFIG_CPU_SH4AL_DSP) := sh4al
32-
isa-$(CONFIG_CPU_SH5) := shmedia
3332

34-
ifeq ($(CONFIG_SUPERH32),y)
3533
isa-$(CONFIG_SH_DSP) := $(isa-y)-dsp
3634
isa-y := $(isa-y)-up
37-
endif
3835

3936
cflags-$(CONFIG_CPU_SH2) := $(call cc-option,-m2,)
4037
cflags-$(CONFIG_CPU_J2) += $(call cc-option,-mj2,)
@@ -47,7 +44,6 @@ cflags-$(CONFIG_CPU_SH4) := $(call cc-option,-m4,) \
4744
cflags-$(CONFIG_CPU_SH4A) += $(call cc-option,-m4a,) \
4845
$(call cc-option,-m4a-nofpu,)
4946
cflags-$(CONFIG_CPU_SH4AL_DSP) += $(call cc-option,-m4al,)
50-
cflags-$(CONFIG_CPU_SH5) := $(call cc-option,-m5-32media-nofpu,)
5147

5248
ifeq ($(cflags-y),)
5349
#
@@ -88,7 +84,7 @@ OBJCOPYFLAGS := -O binary -R .note -R .note.gnu.build-id -R .comment \
8884
-R .stab -R .stabstr -S
8985

9086
# Give the various platforms the opportunity to set default image types
91-
defaultimage-$(CONFIG_SUPERH32) := zImage
87+
defaultimage-y := zImage
9288
defaultimage-$(CONFIG_SH_SH7785LCR) := uImage
9389
defaultimage-$(CONFIG_SH_RSK) := uImage
9490
defaultimage-$(CONFIG_SH_URQUELL) := uImage
@@ -107,31 +103,22 @@ KBUILD_IMAGE := $(boot)/$(defaultimage-y)
107103
# Choosing incompatible machines durings configuration will result in
108104
# error messages during linking.
109105
#
110-
ifdef CONFIG_SUPERH32
111106
UTS_MACHINE := sh
112-
BITS := 32
113107
LDFLAGS_vmlinux += -e _stext
114-
else
115-
UTS_MACHINE := sh64
116-
BITS := 64
117-
LDFLAGS_vmlinux += --defsym phys_stext=_stext-$(CONFIG_PAGE_OFFSET) \
118-
--defsym phys_stext_shmedia=phys_stext+1 \
119-
-e phys_stext_shmedia
120-
endif
121108

122109
ifdef CONFIG_CPU_LITTLE_ENDIAN
123-
ld-bfd := elf32-$(UTS_MACHINE)-linux
110+
ld-bfd := elf32-sh-linux
124111
LDFLAGS_vmlinux += --defsym jiffies=jiffies_64 --oformat $(ld-bfd)
125112
KBUILD_LDFLAGS += -EL
126113
else
127-
ld-bfd := elf32-$(UTS_MACHINE)big-linux
114+
ld-bfd := elf32-shbig-linux
128115
LDFLAGS_vmlinux += --defsym jiffies=jiffies_64+4 --oformat $(ld-bfd)
129116
KBUILD_LDFLAGS += -EB
130117
endif
131118

132-
export ld-bfd BITS
119+
export ld-bfd
133120

134-
head-y := arch/sh/kernel/head_$(BITS).o
121+
head-y := arch/sh/kernel/head_32.o
135122

136123
core-y += arch/sh/kernel/ arch/sh/mm/ arch/sh/boards/
137124
core-$(CONFIG_SH_FPU_EMU) += arch/sh/math-emu/
@@ -185,7 +172,6 @@ cpuincdir-$(CONFIG_CPU_SH2) += cpu-sh2
185172
cpuincdir-$(CONFIG_CPU_SH3) += cpu-sh3
186173
cpuincdir-$(CONFIG_CPU_SH4A) += cpu-sh4a
187174
cpuincdir-$(CONFIG_CPU_SH4) += cpu-sh4
188-
cpuincdir-$(CONFIG_CPU_SH5) += cpu-sh5
189175
cpuincdir-y += cpu-common # Must be last
190176

191177
drivers-y += arch/sh/drivers/
@@ -206,8 +192,7 @@ ifeq ($(CONFIG_DWARF_UNWINDER),y)
206192
KBUILD_CFLAGS += -fasynchronous-unwind-tables
207193
endif
208194

209-
libs-$(CONFIG_SUPERH32) := arch/sh/lib/ $(libs-y)
210-
libs-$(CONFIG_SUPERH64) := arch/sh/lib64/ $(libs-y)
195+
libs-y := arch/sh/lib/ $(libs-y)
211196

212197
BOOT_TARGETS = uImage uImage.bz2 uImage.gz uImage.lzma uImage.xz uImage.lzo \
213198
uImage.srec uImage.bin zImage vmlinux.bin vmlinux.srec \

‎arch/sh/boot/compressed/Makefile

+4-8
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
targets := vmlinux vmlinux.bin vmlinux.bin.gz \
99
vmlinux.bin.bz2 vmlinux.bin.lzma \
1010
vmlinux.bin.xz vmlinux.bin.lzo \
11-
head_$(BITS).o misc.o piggy.o
11+
head_32.o misc.o piggy.o
1212

13-
OBJECTS = $(obj)/head_$(BITS).o $(obj)/misc.o $(obj)/cache.o
13+
OBJECTS = $(obj)/head_32.o $(obj)/misc.o $(obj)/cache.o
1414

1515
GCOV_PROFILE := n
1616

@@ -39,15 +39,11 @@ LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext $(IMAGE_OFFSET) -e startup \
3939
#
4040
# Pull in the necessary libgcc bits from the in-kernel implementation.
4141
#
42-
lib1funcs-$(CONFIG_SUPERH32) := ashiftrt.S ashldi3.c ashrsi3.S ashlsi3.S \
43-
lshrsi3.S
44-
lib1funcs-obj := \
42+
lib1funcs-y := ashiftrt.S ashldi3.c ashrsi3.S ashlsi3.S lshrsi3.S
43+
lib1funcs-obj := \
4544
$(addsuffix .o, $(basename $(addprefix $(obj)/, $(lib1funcs-y))))
4645

4746
lib1funcs-dir := $(srctree)/arch/$(SRCARCH)/lib
48-
ifeq ($(BITS),64)
49-
lib1funcs-dir := $(addsuffix $(BITS), $(lib1funcs-dir))
50-
endif
5147

5248
KBUILD_CFLAGS += -I$(lib1funcs-dir) -DDISABLE_BRANCH_PROFILING
5349

‎arch/sh/boot/compressed/misc.c

-8
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,7 @@ void ftrace_stub(void)
116116
{
117117
}
118118

119-
#ifdef CONFIG_SUPERH64
120-
#define stackalign 8
121-
#else
122119
#define stackalign 4
123-
#endif
124120

125121
#define STACK_SIZE (4096)
126122
long __attribute__ ((aligned(stackalign))) user_stack[STACK_SIZE];
@@ -130,13 +126,9 @@ void decompress_kernel(void)
130126
{
131127
unsigned long output_addr;
132128

133-
#ifdef CONFIG_SUPERH64
134-
output_addr = (CONFIG_MEMORY_START + 0x2000);
135-
#else
136129
output_addr = __pa((unsigned long)&_text+PAGE_SIZE);
137130
#if defined(CONFIG_29BIT)
138131
output_addr |= P2SEG;
139-
#endif
140132
#endif
141133

142134
output = (unsigned char *)output_addr;

‎arch/sh/drivers/pci/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ obj-$(CONFIG_CPU_SUBTYPE_SH7763) += pci-sh7780.o ops-sh4.o
1010
obj-$(CONFIG_CPU_SUBTYPE_SH7780) += pci-sh7780.o ops-sh4.o
1111
obj-$(CONFIG_CPU_SUBTYPE_SH7785) += pci-sh7780.o ops-sh4.o
1212
obj-$(CONFIG_CPU_SUBTYPE_SH7786) += pcie-sh7786.o ops-sh7786.o
13-
obj-$(CONFIG_CPU_SH5) += pci-sh5.o ops-sh5.o
1413

1514
obj-$(CONFIG_SH_DREAMCAST) += ops-dreamcast.o fixups-dreamcast.o \
1615
pci-dreamcast.o

0 commit comments

Comments
 (0)