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/ppc/sys-available/qemu-ppc | 4 ++-- target/ppc/sys-available/toolchain-ppc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'target/ppc') diff --git a/target/ppc/sys-available/qemu-ppc b/target/ppc/sys-available/qemu-ppc index 223e0213b..835741934 100644 --- a/target/ppc/sys-available/qemu-ppc +++ b/target/ppc/sys-available/qemu-ppc @@ -3,7 +3,7 @@ config ADK_TARGET_SYSTEM_QEMU_PPC select ADK_ppc select ADK_qemu_ppc select ADK_CPU_PPC - select ADK_HARDWARE_QEMU + select ADK_TARGET_QEMU help - Support for Qemu Emulator (PPC). + Support for Qemu Emulator PPC architecture. diff --git a/target/ppc/sys-available/toolchain-ppc b/target/ppc/sys-available/toolchain-ppc index dd432ecda..8835ea223 100644 --- a/target/ppc/sys-available/toolchain-ppc +++ b/target/ppc/sys-available/toolchain-ppc @@ -3,8 +3,8 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC select ADK_ppc select ADK_toolchain_ppc select ADK_CPU_PPC - select ADK_TOOLCHAIN + select ADK_TARGET_TOOLCHAIN select ADK_TARGET_PACKAGE_TXZ help - Build a ppc toolchain. + PPC toolchain. -- cgit v1.2.3