From 2735fdf97305e110eba8e776f8728a52ae886c05 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 23 May 2014 16:39:17 +0200 Subject: resolve merge conflict --- target/arm/sys-available/qemu-armhf | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 target/arm/sys-available/qemu-armhf (limited to 'target/arm/sys-available/qemu-armhf') 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). -- cgit v1.2.3