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/mipsel/sys-available | |
parent | 2a2320b4292d4e370cc95aea61525ebd7dc11337 (diff) | |
parent | 34592482701199604242848b80c39bd07b6c7716 (diff) |
resolve merge conflict
Diffstat (limited to 'target/mipsel/sys-available')
-rw-r--r-- | target/mipsel/sys-available/qemu-mipsel (renamed from target/mipsel/sys-available/qemu) | 2 | ||||
-rw-r--r-- | target/mipsel/sys-available/toolchain-mipsel (renamed from target/mipsel/sys-available/toolchain) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/mipsel/sys-available/qemu b/target/mipsel/sys-available/qemu-mipsel index d094ff602..d29333c8d 100644 --- a/target/mipsel/sys-available/qemu +++ b/target/mipsel/sys-available/qemu-mipsel @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_MIPSEL bool "Qemu Emulator" select ADK_mipsel - select ADK_qemu + select ADK_qemu_mipsel select ADK_HARDWARE_QEMU select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_INPUT diff --git a/target/mipsel/sys-available/toolchain b/target/mipsel/sys-available/toolchain-mipsel index 80e40d6b0..c4a1e1c9f 100644 --- a/target/mipsel/sys-available/toolchain +++ b/target/mipsel/sys-available/toolchain-mipsel @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPSEL bool "Toolchain only" select ADK_mipsel - select ADK_toolchain + select ADK_toolchain_mipsel select ADK_TOOLCHAIN_ONLY help mipsel toolchain. |