diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
| commit | 2b38e5af3eb58c27cc646fed11ac1a24805fa05d (patch) | |
| tree | 780bd8869c0ed798d8c0abce17869a29cc01fb01 /target/x86_64/sys-available | |
| parent | 2a2320b4292d4e370cc95aea61525ebd7dc11337 (diff) | |
| parent | 34592482701199604242848b80c39bd07b6c7716 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/x86_64/sys-available')
| -rw-r--r-- | target/x86_64/sys-available/qemu-x86_64 (renamed from target/x86_64/sys-available/qemu) | 2 | ||||
| -rw-r--r-- | target/x86_64/sys-available/toolchain-x86_64 (renamed from target/x86_64/sys-available/toolchain) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/x86_64/sys-available/qemu b/target/x86_64/sys-available/qemu-x86_64 index 464f284fa..e7dd37fa8 100644 --- a/target/x86_64/sys-available/qemu +++ b/target/x86_64/sys-available/qemu-x86_64 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_X86_64 bool "Qemu Emulator" select ADK_x86_64 - select ADK_qemu + select ADK_qemu_x86_64 select ADK_HARDWARE_QEMU select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_INPUT diff --git a/target/x86_64/sys-available/toolchain b/target/x86_64/sys-available/toolchain-x86_64 index 1552e0599..be6a9f5b9 100644 --- a/target/x86_64/sys-available/toolchain +++ b/target/x86_64/sys-available/toolchain-x86_64 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64 bool "Toolchain only" select ADK_x86_64 - select ADK_toolchain + select ADK_toolchain_x86_64 select ADK_TOOLCHAIN_ONLY help Build a x86_64 toolchain. |