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/aarch64 | |
parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) |
resolve merge conflict
Diffstat (limited to 'target/aarch64')
-rw-r--r-- | target/aarch64/sys-available/toolchain-aarch64 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/aarch64/sys-available/toolchain-aarch64 b/target/aarch64/sys-available/toolchain-aarch64 index 638c3cdcf..bcdfd2289 100644 --- a/target/aarch64/sys-available/toolchain-aarch64 +++ b/target/aarch64/sys-available/toolchain-aarch64 @@ -6,9 +6,9 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_AARCH64 select ADK_soft_float select ADK_fpu_vfp select ADK_eabi - select ADK_TOOLCHAIN select ADK_CPU_ARMV8 select ADK_LINUX_64 + select ADK_TARGET_TOOLCHAIN select ADK_TARGET_PACKAGE_TXZ help AARCH64 toolchain. |