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/microblaze/sys-available/toolchain-microblaze | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'target/microblaze/sys-available/toolchain-microblaze') diff --git a/target/microblaze/sys-available/toolchain-microblaze b/target/microblaze/sys-available/toolchain-microblaze index 3b8d3512b..e01ed69a0 100644 --- a/target/microblaze/sys-available/toolchain-microblaze +++ b/target/microblaze/sys-available/toolchain-microblaze @@ -1,10 +1,9 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MICROBLAZE - bool "Toolchain only (big endian)" + bool "Toolchain only" select ADK_microblaze - select ADK_big select ADK_toolchain_microblaze - select ADK_TOOLCHAIN + select ADK_TARGET_TOOLCHAIN select ADK_TARGET_PACKAGE_TXZ help - Microblaze toolchain. + MICROBLAZE toolchain. -- cgit v1.2.3