diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-01 09:18:56 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-01 09:18:56 +0100 |
commit | 256a81b3b12fceef1676d6114d9ff0568b645bca (patch) | |
tree | 80776c7bb719a3f29a64305ff6ff5f9c2445a186 /target/arm | |
parent | 8441e81773371fa37c9d7774436f357e97f4db99 (diff) | |
parent | d7af52ccd4cab1fcffaec5706a8a6eba96502b89 (diff) |
merge conflict
Diffstat (limited to 'target/arm')
-rw-r--r-- | target/arm/sys-available/toolchain-arm | 4 | ||||
-rw-r--r-- | target/arm/sys-available/toolchain-armeb | 11 |
2 files changed, 2 insertions, 13 deletions
diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm index 8ac2da8b6..2cbe76a2e 100644 --- a/target/arm/sys-available/toolchain-arm +++ b/target/arm/sys-available/toolchain-arm @@ -3,9 +3,9 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM select ADK_arm select ADK_toolchain_arm select ADK_little + select ADK_soft_float select ADK_TOOLCHAIN select ADK_EABI select ADK_TARGET_PACKAGE_TGZ help - ARM toolchain (little endian). - + ARM toolchain (soft float). diff --git a/target/arm/sys-available/toolchain-armeb b/target/arm/sys-available/toolchain-armeb deleted file mode 100644 index ad9d2117a..000000000 --- a/target/arm/sys-available/toolchain-armeb +++ /dev/null @@ -1,11 +0,0 @@ -config ADK_TARGET_SYSTEM_TOOLCHAIN_ARMEB - bool "Toolchain only (big endian)" - select ADK_arm - select ADK_toolchain_armeb - select ADK_big - select ADK_TOOLCHAIN - select ADK_EABI - select ADK_TARGET_PACKAGE_TGZ - help - ARM toolchain (big endian). - |