diff --git a/Config.in.legacy b/Config.in.legacy index 2b9575fe22..387653f45d 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.05" +config BR2_sh2a + bool "sh2a architecture support removed" + select BR2_LEGACY + help + The SuperH 2A (SH2A) architecture was not maintained, and + broken, so its support was dropped. + config BR2_BINUTILS_VERSION_2_35_X bool "binutils 2.35.x has been removed" select BR2_LEGACY diff --git a/arch/Config.in.sh b/arch/Config.in.sh index a012cbf491..f00954bb5e 100644 --- a/arch/Config.in.sh +++ b/arch/Config.in.sh @@ -5,8 +5,6 @@ choice help Specific CPU variant to use -config BR2_sh2a - bool "sh2a (SH2A big endian)" config BR2_sh4 bool "sh4 (SH4 little endian)" select BR2_ARCH_HAS_MMU_MANDATORY @@ -22,7 +20,6 @@ config BR2_sh4aeb endchoice config BR2_ARCH - default "sh2a" if BR2_sh2a default "sh4" if BR2_sh4 default "sh4eb" if BR2_sh4eb default "sh4a" if BR2_sh4a @@ -33,7 +30,7 @@ config BR2_NORMALIZED_ARCH config BR2_ENDIAN default "LITTLE" if BR2_sh4 || BR2_sh4a - default "BIG" if BR2_sh2a || BR2_sh4eb || BR2_sh4aeb + default "BIG" if BR2_sh4eb || BR2_sh4aeb config BR2_READELF_ARCH_NAME default "Renesas / SuperH SH" diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in index 2091166b62..310414bebc 100644 --- a/package/uclibc/Config.in +++ b/package/uclibc/Config.in @@ -124,7 +124,6 @@ config BR2_UCLIBC_MIPS_NAN config BR2_UCLIBC_SH_TYPE string - default "SH2A" if BR2_sh2a default "SH4" if BR2_sh4 || BR2_sh4eb depends on BR2_UCLIBC_TARGET_ARCH = "sh" diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 4004c0edf8..be89f68ab5 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -31,7 +31,7 @@ config BR2_TOOLCHAIN_BUILDROOT_UCLIBC BR2_arm || BR2_armeb || \ BR2_i386 || BR2_m68k || BR2_microblaze || \ BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ - BR2_or1k || BR2_powerpc || BR2_RISCV_64 || BR2_sh2a || \ + BR2_or1k || BR2_powerpc || BR2_RISCV_64 || \ BR2_sh4 || BR2_sh4eb || BR2_sparc || BR2_xtensa || \ BR2_x86_64 select BR2_TOOLCHAIN_USES_UCLIBC diff --git a/utils/genrandconfig b/utils/genrandconfig index 59fe34e58d..adefb8f502 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -237,12 +237,9 @@ def fixup_config(sysinfo, configfile): if 'BR2_PACKAGE_PYTHON3=y\n' in configlines and \ BR2_TOOLCHAIN_EXTERNAL_URL + 'mips64el-ctng_n64-linux-gnu.tar.xz"\n' in configlines: return False - # libffi not available on sh2a and ARMv7-M, but propagating libffi - # arch dependencies in Buildroot is really too much work, so we - # handle this here. - if 'BR2_sh2a=y\n' in configlines and \ - 'BR2_PACKAGE_LIBFFI=y\n' in configlines: - return False + # libffi not available on ARMv7-M, but propagating libffi arch + # dependencies in Buildroot is really too much work, so we handle + # this here. if 'BR2_ARM_CPU_ARMV7M=y\n' in configlines and \ 'BR2_PACKAGE_LIBFFI=y\n' in configlines: return False