From 2735fdf97305e110eba8e776f8728a52ae886c05 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 23 May 2014 16:39:17 +0200 Subject: resolve merge conflict --- target/aarch64/sys-available/toolchain-aarch64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/aarch64') 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. -- cgit v1.2.3