From 0a2f68da2a1519596846f7968ca6ef308da2b819 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 1 Oct 2019 12:54:04 +0200 Subject: bfin: fix toolchain compile --- target/linux/Config.in.kernelversion | 6 +++++- toolchain/elf2flt/Makefile | 4 ++-- toolchain/elf2flt/Makefile.inc | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index 372a9e2e2..f666d0287 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -19,13 +19,14 @@ default ADK_TARGET_LINUX_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_CRIS default ADK_TARGET_LINUX_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_H8300 default ADK_TARGET_LINUX_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_METAG default ADK_TARGET_LINUX_KERNEL_VERSION_4_9 if ADK_TARGET_ARCH_AVR32 +default ADK_TARGET_LINUX_KERNEL_VERSION_4_9 if ADK_TARGET_ARCH_BFIN default ADK_TARGET_LINUX_KERNEL_VERSION_4_19 config ADK_TARGET_LINUX_KERNEL_VERSION_GIT bool "git" select ADK_TARGET_LINUX_KERNEL_NEW depends on !ADK_TARGET_ARCH_AVR32 - depends on !ADK_TARGET_ARCH_NDS32 + depends on !ADK_TARGET_ARCH_BFIN select ADK_HOST_NEED_LZOP if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 select ADK_HOST_NEED_LZOP if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK select ADK_HOST_NEED_LZ4 if ADK_TARGET_SYSTEM_PHYTEC_WEGA && ADK_TARGET_LINUX_KERNEL_VERSION_GIT @@ -36,6 +37,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_5_3 bool "5.3.1" select ADK_TARGET_LINUX_KERNEL_NEW depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_CRIS depends on !ADK_TARGET_ARCH_METAG @@ -43,6 +45,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_19 bool "4.19.75" select ADK_TARGET_LINUX_KERNEL_NEW depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_CRIS depends on !ADK_TARGET_ARCH_CSKY depends on !ADK_TARGET_ARCH_METAG @@ -53,6 +56,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_14 bool "4.14.142" select ADK_TARGET_LINUX_KERNEL_NEW depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_CRIS depends on !ADK_TARGET_ARCH_CSKY depends on !ADK_TARGET_ARCH_METAG diff --git a/toolchain/elf2flt/Makefile b/toolchain/elf2flt/Makefile index 4489e71af..dc7f32607 100644 --- a/toolchain/elf2flt/Makefile +++ b/toolchain/elf2flt/Makefile @@ -9,8 +9,8 @@ include $(ADK_TOPDIR)/mk/buildhlp.mk ifeq ($(ADK_TOOLCHAIN_BINUTILS_GIT),y) BINUTILS_VERSION:= git endif -ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_31),y) -BINUTILS_VERSION:= 2.31.1 +ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_32),y) +BINUTILS_VERSION:= 2.32 endif ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_29),y) BINUTILS_VERSION:= 2.29.1 diff --git a/toolchain/elf2flt/Makefile.inc b/toolchain/elf2flt/Makefile.inc index 6f5fa1273..30a3cebfe 100644 --- a/toolchain/elf2flt/Makefile.inc +++ b/toolchain/elf2flt/Makefile.inc @@ -2,7 +2,7 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= elf2flt -PKG_VERSION:= 6d80ab6c93409e796f85da404bde84b841231531 +PKG_VERSION:= 7e33f28df198c46764021ed14408bd262751e148 PKG_GIT:= hash PKG_RELEASE:= 1 PKG_SITES:= https://github.com/uclinux-dev/elf2flt.git -- cgit v1.2.3