diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
commit | 2b38e5af3eb58c27cc646fed11ac1a24805fa05d (patch) | |
tree | 780bd8869c0ed798d8c0abce17869a29cc01fb01 /target/arm/sys-available | |
parent | 2a2320b4292d4e370cc95aea61525ebd7dc11337 (diff) | |
parent | 34592482701199604242848b80c39bd07b6c7716 (diff) |
resolve merge conflict
Diffstat (limited to 'target/arm/sys-available')
-rw-r--r-- | target/arm/sys-available/toolchain-arm (renamed from target/arm/sys-available/toolchain) | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/arm/sys-available/toolchain b/target/arm/sys-available/toolchain-arm index af1aa06a1..83a9bb5de 100644 --- a/target/arm/sys-available/toolchain +++ b/target/arm/sys-available/toolchain-arm @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM bool "Toolchain only" select ADK_arm - select ADK_toolchain + select ADK_toolchain_arm select ADK_TOOLCHAIN_ONLY select ADK_EABI select ADK_TARGET_NO_FPU |