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/sparc/sys-available/qemu-sparc | 4 ++-- target/sparc/sys-available/toolchain-sparc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'target/sparc') diff --git a/target/sparc/sys-available/qemu-sparc b/target/sparc/sys-available/qemu-sparc index 26866628f..1f1827fe4 100644 --- a/target/sparc/sys-available/qemu-sparc +++ b/target/sparc/sys-available/qemu-sparc @@ -3,8 +3,8 @@ config ADK_TARGET_SYSTEM_QEMU_SPARC select ADK_sparc select ADK_qemu_sparc select ADK_CPU_SPARC_V8 - select ADK_HARDWARE_QEMU + select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_ZIMAGE help - Support for Qemu Emulator (SPARC). + Support for Qemu Emulator SPARC architecture. diff --git a/target/sparc/sys-available/toolchain-sparc b/target/sparc/sys-available/toolchain-sparc index e7f5aafc4..be18341f9 100644 --- a/target/sparc/sys-available/toolchain-sparc +++ b/target/sparc/sys-available/toolchain-sparc @@ -3,8 +3,8 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC select ADK_sparc select ADK_toolchain_sparc select ADK_CPU_SPARC_V8 - select ADK_TOOLCHAIN + select ADK_TARGET_TOOLCHAIN select ADK_TARGET_PACKAGE_TXZ help - Build a sparc toolchain. + SPARC toolchain. -- cgit v1.2.3