summaryrefslogtreecommitdiff
path: root/target/sparc64/sys-available
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-23 16:39:17 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-23 16:39:17 +0200
commit2735fdf97305e110eba8e776f8728a52ae886c05 (patch)
tree0ce26ce1066bd7260625ca641b1e64c99015f47f /target/sparc64/sys-available
parent65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff)
resolve merge conflict
Diffstat (limited to 'target/sparc64/sys-available')
-rw-r--r--target/sparc64/sys-available/qemu-sparc644
-rw-r--r--target/sparc64/sys-available/toolchain-sparc644
2 files changed, 4 insertions, 4 deletions
diff --git a/target/sparc64/sys-available/qemu-sparc64 b/target/sparc64/sys-available/qemu-sparc64
index d750ea1e4..93f851e9a 100644
--- a/target/sparc64/sys-available/qemu-sparc64
+++ b/target/sparc64/sys-available/qemu-sparc64
@@ -4,7 +4,7 @@ config ADK_TARGET_SYSTEM_QEMU_SPARC64
select ADK_qemu_sparc64
select ADK_LINUX_64
select ADK_CPU_SPARC_V9
- select ADK_HARDWARE_QEMU
+ select ADK_TARGET_QEMU
select ADK_TARGET_KERNEL_ZIMAGE
help
- Support for Qemu Emulator (SPARC64).
+ Support for Qemu Emulator SPARC64 architecture.
diff --git a/target/sparc64/sys-available/toolchain-sparc64 b/target/sparc64/sys-available/toolchain-sparc64
index a83ecd198..1cc1edb86 100644
--- a/target/sparc64/sys-available/toolchain-sparc64
+++ b/target/sparc64/sys-available/toolchain-sparc64
@@ -4,8 +4,8 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC64
select ADK_toolchain_sparc64
select ADK_CPU_SPARC_V9
select ADK_LINUX_64
- select ADK_TOOLCHAIN
+ select ADK_TARGET_TOOLCHAIN
select ADK_TARGET_PACKAGE_TXZ
help
- Build a sparc64 toolchain.
+ SPARC64 toolchain.