diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
| commit | 2735fdf97305e110eba8e776f8728a52ae886c05 (patch) | |
| tree | 0ce26ce1066bd7260625ca641b1e64c99015f47f /target/ppc/sys-available | |
| parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/ppc/sys-available')
| -rw-r--r-- | target/ppc/sys-available/qemu-ppc | 4 | ||||
| -rw-r--r-- | target/ppc/sys-available/toolchain-ppc | 4 |
2 files changed, 4 insertions, 4 deletions
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. |