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/ppc64/sys-available/qemu-ppc64 | 4 ++-- target/ppc64/sys-available/toolchain-ppc64 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'target/ppc64') diff --git a/target/ppc64/sys-available/qemu-ppc64 b/target/ppc64/sys-available/qemu-ppc64 index ffc77a388..a0ff6ada8 100644 --- a/target/ppc64/sys-available/qemu-ppc64 +++ b/target/ppc64/sys-available/qemu-ppc64 @@ -4,7 +4,7 @@ config ADK_TARGET_SYSTEM_QEMU_PPC64 select ADK_qemu_ppc64 select ADK_CPU_PPC64 select ADK_LINUX_64 - select ADK_HARDWARE_QEMU + select ADK_TARGET_QEMU help - Support for Qemu Emulator (PPC64). + Support for Qemu Emulator PPC64 architecture. diff --git a/target/ppc64/sys-available/toolchain-ppc64 b/target/ppc64/sys-available/toolchain-ppc64 index dce18a3a3..0aff9f3a3 100644 --- a/target/ppc64/sys-available/toolchain-ppc64 +++ b/target/ppc64/sys-available/toolchain-ppc64 @@ -4,8 +4,8 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC64 select ADK_toolchain_ppc64 select ADK_CPU_PPC64 select ADK_LINUX_64 - select ADK_TOOLCHAIN + select ADK_TAGET_TOOLCHAIN select ADK_TARGET_PACKAGE_TXZ help - Build a ppc64 toolchain. + PPC64 toolchain. -- cgit v1.2.3