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/microblaze | |
| parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/microblaze')
4 files changed, 6 insertions, 30 deletions
diff --git a/target/microblaze/sys-available/qemu-microblaze b/target/microblaze/sys-available/qemu-microblaze index ee9cb6a52..ac4a36e9d 100644 --- a/target/microblaze/sys-available/qemu-microblaze +++ b/target/microblaze/sys-available/qemu-microblaze @@ -1,11 +1,9 @@ config ADK_TARGET_SYSTEM_QEMU_MICROBLAZE - bool "Qemu Emulator (big endian)" + bool "Qemu Emulator" select ADK_microblaze - select ADK_big select ADK_qemu_microblaze - select ADK_HARDWARE_QEMU - select ADK_TARGET_WITH_MTD + select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_LINUXBIN help - Qemu support for microblaze big endian architecture. + Qemu support for MICROBLAZE architecture. diff --git a/target/microblaze/sys-available/qemu-microblazeel b/target/microblaze/sys-available/qemu-microblazeel deleted file mode 100644 index 8dff0e260..000000000 --- a/target/microblaze/sys-available/qemu-microblazeel +++ /dev/null @@ -1,11 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL - bool "Qemu Emulator (little endian)" - select ADK_microblaze - select ADK_qemu_microblazeel - select ADK_little - select ADK_HARDWARE_QEMU - select ADK_TARGET_WITH_MTD - select ADK_TARGET_KERNEL_LINUXBIN - help - Qemu support for microblaze little endian architecture. - diff --git a/target/microblaze/sys-available/toolchain-microblaze b/target/microblaze/sys-available/toolchain-microblaze index 3b8d3512b..e01ed69a0 100644 --- a/target/microblaze/sys-available/toolchain-microblaze +++ b/target/microblaze/sys-available/toolchain-microblaze @@ -1,10 +1,9 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MICROBLAZE - bool "Toolchain only (big endian)" + bool "Toolchain only" select ADK_microblaze - select ADK_big select ADK_toolchain_microblaze - select ADK_TOOLCHAIN + select ADK_TARGET_TOOLCHAIN select ADK_TARGET_PACKAGE_TXZ help - Microblaze toolchain. + MICROBLAZE toolchain. diff --git a/target/microblaze/sys-available/toolchain-microblazeel b/target/microblaze/sys-available/toolchain-microblazeel deleted file mode 100644 index c41e26f91..000000000 --- a/target/microblaze/sys-available/toolchain-microblazeel +++ /dev/null @@ -1,10 +0,0 @@ -config ADK_TARGET_SYSTEM_TOOLCHAIN_MICROBLAZEEL - bool "Toolchain only (little endian)" - select ADK_microblaze - select ADK_little - select ADK_toolchain_microblazeel - select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TXZ - help - Microblaze toolchain. - |