From bc306fe06b41cdb1adbd523c0c8214b82d4f9fca Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 19 Oct 2020 15:03:36 +0200 Subject: sh: downgrade binutils, newer versionns mislinking kernel --- target/config/Config.in.binutils | 14 +++++++++++++- target/linux/Config.in.kernelversion | 2 +- toolchain/binutils/Makefile.inc | 14 ++++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/target/config/Config.in.binutils b/target/config/Config.in.binutils index 5a90d909f..3170f357a 100644 --- a/target/config/Config.in.binutils +++ b/target/config/Config.in.binutils @@ -8,6 +8,7 @@ default ADK_TOOLCHAIN_BINUTILS_AVR32 if ADK_TARGET_ARCH_AVR32 default ADK_TOOLCHAIN_BINUTILS_KVX if ADK_TARGET_ARCH_KVX default ADK_TOOLCHAIN_BINUTILS_NDS32 if ADK_TARGET_ARCH_NDS32 default ADK_TOOLCHAIN_BINUTILS_2_28 if ADK_TARGET_CPU_SH_J2 +default ADK_TOOLCHAIN_BINUTILS_2_32 if ADK_TARGET_ARCH_SH default ADK_TOOLCHAIN_BINUTILS_2_34 if ADK_TARGET_ARCH_BFIN default ADK_TOOLCHAIN_BINUTILS_2_35 @@ -25,7 +26,18 @@ config ADK_TOOLCHAIN_BINUTILS_2_35 config ADK_TOOLCHAIN_BINUTILS_2_34 bool "2.34" - depends on ADK_TARGET_ARCH_BFIN # ld segfault for FDPIC + depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_NDS32 + +config ADK_TOOLCHAIN_BINUTILS_2_33 + bool "2.33.1" + depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_NDS32 + +config ADK_TOOLCHAIN_BINUTILS_2_32 + bool "2.32" + depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_NDS32 config ADK_TOOLCHAIN_BINUTILS_2_28 bool "2.28" diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index 6419c52bf..61ff9d97f 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -53,7 +53,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_5_4 depends on !ADK_TARGET_CPU_ARM_CORTEX_A53 config ADK_TARGET_LINUX_KERNEL_VERSION_4_19 - bool "4.19.149" + bool "4.19.151" select ADK_TARGET_LINUX_KERNEL_NEW depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN diff --git a/toolchain/binutils/Makefile.inc b/toolchain/binutils/Makefile.inc index 65c9a4130..5da63b05c 100644 --- a/toolchain/binutils/Makefile.inc +++ b/toolchain/binutils/Makefile.inc @@ -16,6 +16,20 @@ PKG_HASH:= f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 PKG_SITES:= ${MASTER_SITE_GNU:=binutils/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz endif +ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_33),y) +PKG_VERSION:= 2.33.1 +PKG_RELEASE:= 1 +PKG_HASH:= ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf +PKG_SITES:= ${MASTER_SITE_GNU:=binutils/} +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz +endif +ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_32),y) +PKG_VERSION:= 2.32 +PKG_RELEASE:= 1 +PKG_HASH:= 0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 +PKG_SITES:= ${MASTER_SITE_GNU:=binutils/} +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz +endif ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_28),y) PKG_VERSION:= 2.28 PKG_RELEASE:= 1 -- cgit v1.2.3