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/sparc | |
| parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/sparc')
| -rw-r--r-- | target/sparc/sys-available/qemu-sparc | 4 | ||||
| -rw-r--r-- | target/sparc/sys-available/toolchain-sparc | 4 |
2 files changed, 4 insertions, 4 deletions
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. |