From 4380a203beb6172d0953c865a9efe791a3852cea Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 24 Jul 2015 13:50:42 +0200 Subject: binutils 2.25 does not work with crisv10 --- target/config/Config.in.binutils.choice | 3 ++- target/config/Config.in.gcc.choice | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/target/config/Config.in.binutils.choice b/target/config/Config.in.binutils.choice index 0f689e72c..3ab18c8cb 100644 --- a/target/config/Config.in.binutils.choice +++ b/target/config/Config.in.binutils.choice @@ -20,6 +20,7 @@ config ADK_TOOLCHAIN_BINUTILS_2_25_1 depends on !ADK_TARGET_ARCH_ARC depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_H8300 + depends on !ADK_CPU_CRIS_V10 config ADK_TOOLCHAIN_BINUTILS_2_24 bool "2.24" @@ -36,7 +37,7 @@ config ADK_TOOLCHAIN_BINUTILS_2_23_ARC config ADK_TOOLCHAIN_BINUTILS_2_22 bool "2.22" depends on ADK_TARGET_ARCH_BFIN \ - || ADK_TARGET_ARCH_CRIS + || ADK_CPU_CRIS_V10 config ADK_TOOLCHAIN_BINUTILS_2_20_1 bool "2.20.1" diff --git a/target/config/Config.in.gcc.choice b/target/config/Config.in.gcc.choice index b4f3d63a2..0bb3223a4 100644 --- a/target/config/Config.in.gcc.choice +++ b/target/config/Config.in.gcc.choice @@ -3,11 +3,11 @@ choice prompt "GCC version" -default ADK_TOOLCHAIN_GCC_4_7_4 if ADK_TARGET_ARCH_C6X +default ADK_TOOLCHAIN_GCC_4_2_4 if ADK_TARGET_ARCH_METAG +default ADK_TOOLCHAIN_GCC_4_4_7 if ADK_TARGET_ARCH_AVR32 default ADK_TOOLCHAIN_GCC_4_5_4 if ADK_TARGET_ARCH_BFIN +default ADK_TOOLCHAIN_GCC_4_7_4 if ADK_TARGET_ARCH_C6X default ADK_TOOLCHAIN_GCC_4_8_ARC if ADK_TARGET_ARCH_ARC -default ADK_TOOLCHAIN_GCC_4_4_7 if ADK_TARGET_ARCH_AVR32 -default ADK_TOOLCHAIN_GCC_4_2_4 if ADK_TARGET_ARCH_METAG default ADK_TOOLCHAIN_GCC_4_9_OR1K if ADK_TARGET_ARCH_OR1K default ADK_TOOLCHAIN_GCC_4_9_3 -- cgit v1.2.3