summaryrefslogtreecommitdiff
path: root/target/config
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2018-04-21 17:39:25 +0100
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2018-04-22 10:55:18 +0100
commit78cfc08d9cd15de79da69f766d8f064fa9b1a2c9 (patch)
tree3bed1229026f4879d326cc42823376373b61683e /target/config
parentb9184a07a902ddea8258e5825397b0b43f138ab6 (diff)
arm: fix thumb2 mode with binutils 2.30
Diffstat (limited to 'target/config')
-rw-r--r--target/config/Config.in.archopts6
-rw-r--r--target/config/Config.in.binutils5
2 files changed, 5 insertions, 6 deletions
diff --git a/target/config/Config.in.archopts b/target/config/Config.in.archopts
index e6d5cf00e..9393a5ac8 100644
--- a/target/config/Config.in.archopts
+++ b/target/config/Config.in.archopts
@@ -10,8 +10,10 @@ config ADK_TARGET_ARCH_ARM_WITH_ARM
config ADK_TARGET_ARCH_ARM_WITH_THUMB
bool "thumb"
- select ADK_KERNEL_ARM_THUMB
- select ADK_KERNEL_THUMB2_KERNEL
+ select ADK_LINUX_KERNEL_ARM_THUMB if ADK_TARGET_OS_LINUX
+ select ADK_LINUX_KERNEL_THUMB2_KERNEL if ADK_TARGET_OS_LINUX
+ select ADK_WALDUX_KERNEL_ARM_THUMB if ADK_TARGET_OS_WALDUX
+ select ADK_WALDUX_KERNEL_THUMB2_KERNEL if ADK_TARGET_OS_WALDUX
depends on ADK_TARGET_CPU_WITH_THUMB || ADK_TARGET_CPU_WITH_THUMB2
endchoice
diff --git a/target/config/Config.in.binutils b/target/config/Config.in.binutils
index 8ba6e0898..6e3d3383c 100644
--- a/target/config/Config.in.binutils
+++ b/target/config/Config.in.binutils
@@ -7,7 +7,6 @@ default ADK_TOOLCHAIN_BINUTILS_ARC if ADK_TARGET_ARCH_ARC
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_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 if ADK_TARGET_ARCH_CRIS
default ADK_TOOLCHAIN_BINUTILS_2_30
@@ -24,7 +23,6 @@ config ADK_TOOLCHAIN_BINUTILS_2_30
depends on !ADK_TARGET_ARCH_AVR32
depends on !ADK_TARGET_ARCH_CSKY
depends on !ADK_TARGET_ARCH_NDS32
- depends on !(ADK_TARGET_ARCH_ARM && ADK_KERNEL_THUMB2_KERNEL && ADK_TARGET_OS_LINUX)
depends on !ADK_TARGET_CPU_SH_J2
config ADK_TOOLCHAIN_BINUTILS_2_29
@@ -33,8 +31,7 @@ config ADK_TOOLCHAIN_BINUTILS_2_29
config ADK_TOOLCHAIN_BINUTILS_2_28
bool "2.28"
- depends on ADK_TARGET_CPU_SH_J2 \
- || (ADK_TARGET_ARCH_ARM && ADK_KERNEL_THUMB2_KERNEL && ADK_TARGET_OS_LINUX)
+ depends on ADK_TARGET_CPU_SH_J2
config ADK_TOOLCHAIN_BINUTILS_ARC
bool "arc-2018.03-release"