Skip to content

Commit 4338a31

Browse files
gustavoztpetazzoni
authored andcommitted
arch: remove support for sh64
It's been deprecated for quite some time now. Signed-off-by: Gustavo Zacarias <[email protected]> Signed-off-by: Thomas Petazzoni <[email protected]>
1 parent 524b6b8 commit 4338a31

File tree

10 files changed

+14
-26
lines changed

10 files changed

+14
-26
lines changed

.defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ BR2_i386=y
1515
# BR2_nios2 is not set
1616
# BR2_powerpc is not set
1717
# BR2_sh is not set
18-
# BR2_sh64 is not set
1918
# BR2_sparc is not set
2019
# BR2_sparc64 is not set
2120
# BR2_x86_64 is not set

arch/Config.in

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -197,16 +197,6 @@ config BR2_sh
197197
http://www.hitachi.com/
198198
http://en.wikipedia.org/wiki/SuperH
199199

200-
config BR2_sh64
201-
bool "SuperH64"
202-
depends on BR2_DEPRECATED_SINCE_2015_05
203-
select BR2_ARCH_HAS_MMU_MANDATORY
204-
help
205-
SuperH64 (or SH) is a 64-bit reduced instruction set computer (RISC)
206-
instruction set architecture (ISA) developed by Hitachi.
207-
http://www.hitachi.com/
208-
http://en.wikipedia.org/wiki/SuperH
209-
210200
config BR2_sparc
211201
bool "SPARC"
212202
select BR2_ARCH_HAS_MMU_MANDATORY
@@ -396,7 +386,7 @@ if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
396386
source "arch/Config.in.powerpc"
397387
endif
398388

399-
if BR2_sh || BR2_sh64
389+
if BR2_sh
400390
source "arch/Config.in.sh"
401391
endif
402392

arch/Config.in.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ config BR2_ARCH
2323
default "sh4eb" if BR2_sh4eb
2424
default "sh4a" if BR2_sh4a
2525
default "sh4aeb" if BR2_sh4aeb
26-
default "sh64" if BR2_sh64
2726

2827
config BR2_ENDIAN
29-
default "LITTLE" if BR2_sh4 || BR2_sh4a || BR2_sh64
28+
default "LITTLE" if BR2_sh4 || BR2_sh4a
3029
default "BIG" if BR2_sh2a || BR2_sh4eb || BR2_sh4aeb

linux/Config.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ config BR2_LINUX_KERNEL_UIMAGE
179179
bool "uImage"
180180
depends on BR2_arc || BR2_arm || BR2_armeb || BR2_bfin || \
181181
BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \
182-
BR2_sh || BR2_sh64 || BR2_mips || BR2_mipsel || \
182+
BR2_sh || BR2_mips || BR2_mipsel || \
183183
BR2_mips64 || BR2_mips64el
184184
select BR2_LINUX_KERNEL_UBOOT_IMAGE
185185

@@ -198,7 +198,7 @@ config BR2_LINUX_KERNEL_ZIMAGE
198198
bool "zImage"
199199
depends on BR2_arm || BR2_armeb || BR2_powerpc || \
200200
BR2_powerpc64 || BR2_powerpc64le || BR2_sparc || \
201-
BR2_sh || BR2_sh64 || BR2_xtensa
201+
BR2_sh || BR2_xtensa
202202

203203
config BR2_LINUX_KERNEL_ZIMAGE_EPAPR
204204
bool "zImage.epapr"
@@ -235,7 +235,7 @@ config BR2_LINUX_KERNEL_LINUX_BIN
235235

236236
config BR2_LINUX_KERNEL_VMLINUX_BIN
237237
bool "vmlinux.bin"
238-
depends on BR2_mips || BR2_mipsel || BR2_sh || BR2_sh64
238+
depends on BR2_mips || BR2_mipsel || BR2_sh
239239

240240
config BR2_LINUX_KERNEL_VMLINUX
241241
bool "vmlinux"

package/fdk-aac/Config.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ config BR2_PACKAGE_FDK_AAC
44
# These are the architectures supported by FDK AAC
55
depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \
66
BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \
7-
BR2_powerpc || BR2_sh || BR2_sh64
7+
BR2_powerpc || BR2_sh
88

99
help
1010
The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec")
@@ -17,4 +17,4 @@ comment "fdk-aac needs a toolchain w/ C++"
1717
depends on !BR2_INSTALL_LIBSTDCPP
1818
depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \
1919
BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \
20-
BR2_powerpc || BR2_sh || BR2_sh64
20+
BR2_powerpc || BR2_sh

package/gauche/Config.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ config BR2_PACKAGE_GAUCHE_ARCH_SUPPORTS
44
default y if BR2_arm || BR2_armeb || BR2_i386 || BR2_m68k || \
55
BR2_mips || BR2_mipsel || BR2_mips64 || \
66
BR2_mips64el || BR2_powerpc || BR2_powerpc64 || \
7-
BR2_powerpc64le || BR2_sh || BR2_sh64 || BR2_x86_64
7+
BR2_powerpc64le || BR2_sh || BR2_x86_64
88

99
config BR2_PACKAGE_GAUCHE
1010
bool "gauche"

package/gdb/Config.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ config BR2_PACKAGE_GDB_DEBUGGER
4040
bool "full debugger"
4141
select BR2_PACKAGE_NCURSES
4242
depends on BR2_USE_WCHAR
43-
depends on !BR2_sh && !BR2_sh64 && !BR2_microblaze
43+
depends on !BR2_sh && !BR2_microblaze
4444

4545
comment "full gdb on target needs a toolchain w/ wchar"
46-
depends on !BR2_sh && !BR2_sh64 && !BR2_microblaze
46+
depends on !BR2_sh && !BR2_microblaze
4747
depends on !BR2_USE_WCHAR
4848

4949
if BR2_PACKAGE_GDB_DEBUGGER

package/libunwind/Config.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS
1212
default y if BR2_TOOLCHAIN_USES_GLIBC && \
1313
(((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) || \
1414
BR2_mips || BR2_mipsel || BR2_mips64 || \
15-
BR2_mips64el || BR2_powerpc || BR2_sh || BR2_sh64 || BR2_i386 || BR2_x86_64)
15+
BR2_mips64el || BR2_powerpc || BR2_sh || BR2_i386 || BR2_x86_64)
1616
default y if BR2_TOOLCHAIN_USES_UCLIBC && \
1717
(((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) || \
1818
BR2_i386 || BR2_mips || BR2_mipsel || \

package/ruby/ruby.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUBY_CFLAGS = $(TARGET_CFLAGS)
2424
# With some SuperH toolchains (like Sourcery CodeBench 2012.09), ruby fails to
2525
# build with 'pcrel too far'. This seems to be caused by the -Os option we pass
2626
# by default. To fix the problem, use standard -O2 optimization instead.
27-
ifeq ($(BR2_sh)$(BR2_sh64),y)
27+
ifeq ($(BR2_sh),y)
2828
RUBY_CFLAGS += -O2
2929
endif
3030
RUBY_CONF_ENV = CFLAGS="$(RUBY_CFLAGS)"

toolchain/toolchain-buildroot/Config.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC
4848
BR2_aarch64_be || BR2_i386 || BR2_mips || \
4949
BR2_mipsel || BR2_mips64 || BR2_mips64el|| \
5050
BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \
51-
BR2_sh || BR2_sh64 || BR2_sparc64 || \
52-
BR2_x86_64 || BR2_microblaze || BR2_nios2
51+
BR2_sh || BR2_sparc64 || BR2_x86_64 || \
52+
BR2_microblaze || BR2_nios2
5353
depends on BR2_USE_MMU
5454
depends on !BR2_STATIC_LIBS
5555
depends on !BR2_powerpc_SPE

0 commit comments

Comments
 (0)