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/arm/sys-available/qemu-arm | |
| parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/arm/sys-available/qemu-arm')
| -rw-r--r-- | target/arm/sys-available/qemu-arm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/target/arm/sys-available/qemu-arm b/target/arm/sys-available/qemu-arm index 1fa057c4b..848179629 100644 --- a/target/arm/sys-available/qemu-arm +++ b/target/arm/sys-available/qemu-arm @@ -3,9 +3,8 @@ config ADK_TARGET_SYSTEM_QEMU_ARM select ADK_arm select ADK_qemu_arm select ADK_little - select ADK_soft_float select ADK_eabi - select ADK_HARDWARE_QEMU + select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_ZIMAGE help - Support for Qemu Emulator (arm). + Qemu Emulator for arm architecture. |