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-armhf | |
| parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/arm/sys-available/qemu-armhf')
| -rw-r--r-- | target/arm/sys-available/qemu-armhf | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/target/arm/sys-available/qemu-armhf b/target/arm/sys-available/qemu-armhf deleted file mode 100644 index dab039931..000000000 --- a/target/arm/sys-available/qemu-armhf +++ /dev/null @@ -1,12 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_ARMHF - bool "Qemu Emulator (hard-float)" - select ADK_arm - select ADK_qemu_armhf - select ADK_little - select ADK_hard_float - select ADK_eabihf - select ADK_fpu_vfp - select ADK_HARDWARE_QEMU - select ADK_TARGET_KERNEL_ZIMAGE - help - Support for Qemu Emulator (armhf). |