summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2018-01-07 23:10:12 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2018-01-07 23:23:46 +0100
commitb5b72b1e8cc2267e69af149f48b755b97627e74e (patch)
tree4e6e327c747a0bd0adab3325f67051eb02d7b1ba /target
parentd327bd6fe3f1f5bce550a0626564b77822e59689 (diff)
binutils/gcc: cosmetic changes
Diffstat (limited to 'target')
-rw-r--r--target/config/Config.in.binutils8
-rw-r--r--target/config/Config.in.compiler32
2 files changed, 18 insertions, 22 deletions
diff --git a/target/config/Config.in.binutils b/target/config/Config.in.binutils
index 7ef88714c..92f8b674f 100644
--- a/target/config/Config.in.binutils
+++ b/target/config/Config.in.binutils
@@ -3,9 +3,9 @@
choice
prompt "Binutils version"
+default ADK_TOOLCHAIN_BINUTILS_AVR32 if ADK_TARGET_ARCH_AVR32
default ADK_TOOLCHAIN_BINUTILS_CSKY if ADK_TARGET_ARCH_CSKY
default ADK_TOOLCHAIN_BINUTILS_NDS32 if ADK_TARGET_ARCH_NDS32
-default ADK_TOOLCHAIN_BINUTILS_2_20_1 if ADK_TARGET_ARCH_AVR32
default ADK_TOOLCHAIN_BINUTILS_2_28 if ADK_TARGET_ARCH_ARM && ADK_KERNEL_THUMB2_KERNEL && ADK_TARGET_OS_LINUX
default ADK_TOOLCHAIN_BINUTILS_2_28 if ADK_TARGET_CPU_SH_J2
default ADK_TOOLCHAIN_BINUTILS_2_29
@@ -34,11 +34,11 @@ config ADK_TOOLCHAIN_BINUTILS_NDS32
depends on ADK_TARGET_ARCH_NDS32
config ADK_TOOLCHAIN_BINUTILS_CSKY
- bool "2.27-c-sky"
+ bool "2.27-csky"
depends on ADK_TARGET_ARCH_CSKY
-config ADK_TOOLCHAIN_BINUTILS_2_20_1
- bool "2.20.1"
+config ADK_TOOLCHAIN_BINUTILS_AVR32
+ bool "2.20.1-avr32"
depends on ADK_TARGET_ARCH_AVR32
endchoice
diff --git a/target/config/Config.in.compiler b/target/config/Config.in.compiler
index e630e97c6..a9155cd92 100644
--- a/target/config/Config.in.compiler
+++ b/target/config/Config.in.compiler
@@ -16,11 +16,11 @@ endchoice
choice
prompt "GCC version"
depends on ADK_BUILD_COMPILER_GCC
+default ADK_TOOLCHAIN_GCC_AVR32 if ADK_TARGET_ARCH_AVR32
default ADK_TOOLCHAIN_GCC_CSKY if ADK_TARGET_ARCH_CSKY
-default ADK_TOOLCHAIN_GCC_OR1K if ADK_TARGET_ARCH_OR1K
+default ADK_TOOLCHAIN_GCC_METAG if ADK_TARGET_ARCH_METAG
default ADK_TOOLCHAIN_GCC_NDS32 if ADK_TARGET_ARCH_NDS32
-default ADK_TOOLCHAIN_GCC_4_2 if ADK_TARGET_ARCH_METAG
-default ADK_TOOLCHAIN_GCC_4_4 if ADK_TARGET_ARCH_AVR32
+default ADK_TOOLCHAIN_GCC_OR1K if ADK_TARGET_ARCH_OR1K
default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_CPU_SH_J2
default ADK_TOOLCHAIN_GCC_7
@@ -46,28 +46,24 @@ config ADK_TOOLCHAIN_GCC_6
bool "6.3.0"
depends on ADK_TARGET_CPU_SH_J2
+config ADK_TOOLCHAIN_GCC_AVR32
+ bool "4.4.7-avr32"
+ depends on ADK_TARGET_ARCH_AVR32
+
config ADK_TOOLCHAIN_GCC_CSKY
- bool "csky"
+ bool "6.3.0-csky"
depends on ADK_TARGET_ARCH_CSKY
-config ADK_TOOLCHAIN_GCC_OR1K
- bool "or1k"
- depends on ADK_TARGET_ARCH_OR1K
+config ADK_TOOLCHAIN_GCC_METAG
+ bool "4.2.4-metag"
+ depends on ADK_TARGET_ARCH_METAG
config ADK_TOOLCHAIN_GCC_NDS32
bool "4.9.4-nds32"
depends on ADK_TARGET_ARCH_NDS32
-config ADK_TOOLCHAIN_GCC_4_4
- bool "4.4.7"
- depends on ADK_TARGET_ARCH_AVR32
-
-config ADK_TOOLCHAIN_GCC_4_2
- bool "4.2.4"
- select ADK_TOOLCHAIN_GCC_OLD
- depends on ADK_TARGET_ARCH_METAG
+config ADK_TOOLCHAIN_GCC_OR1K
+ bool "5.4.0-or1k"
+ depends on ADK_TARGET_ARCH_OR1K
endchoice
-
-config ADK_TOOLCHAIN_GCC_OLD
- bool