diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
| commit | 2735fdf97305e110eba8e776f8728a52ae886c05 (patch) | |
| tree | 0ce26ce1066bd7260625ca641b1e64c99015f47f /target/arm/sys-available/toolchain-arm | |
| parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/arm/sys-available/toolchain-arm')
| -rw-r--r-- | target/arm/sys-available/toolchain-arm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm index 876bcd84a..a98f9c225 100644 --- a/target/arm/sys-available/toolchain-arm +++ b/target/arm/sys-available/toolchain-arm @@ -1,12 +1,10 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM - bool "Toolchain only (soft float)" + bool "Toolchain only" select ADK_arm select ADK_toolchain_arm select ADK_little - select ADK_soft_float select ADK_eabi - select ADK_TOOLCHAIN + select ADK_TARGET_TOOLCHAIN select ADK_TARGET_PACKAGE_TXZ - select ADK_CPU_CORTEX_A9 help - ARM toolchain (soft float) for Cortex A9. + ARM toolchain. |