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/sys-available/qemu-microblaze | |
| parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/microblaze/sys-available/qemu-microblaze')
| -rw-r--r-- | target/microblaze/sys-available/qemu-microblaze | 8 |
1 files changed, 3 insertions, 5 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. |