From dcb61db68d2e73ed5d8ad3f075ae01de2e78f8ba Mon Sep 17 00:00:00 2001
From: Alistair Francis <alistair.francis@wdc.com>
Date: Thu, 16 Aug 2018 13:58:43 -0700
Subject: [PATCH] qemu: Remove the RISC-V fork of QEMU

As QEMU 3.0 is now included in OE-Corewe no longer need to use
the RISC-V specific fork.

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
 conf/machine/freedom-u540.conf      |  1 -
 conf/machine/qemuriscv64.conf       |  1 -
 conf/machine/riscv32.conf           |  1 -
 conf/machine/riscv64.conf           |  1 -
 recipes-devtools/qemu/qemu_riscv.bb | 23 -----------------------
 5 files changed, 27 deletions(-)
 delete mode 100644 recipes-devtools/qemu/qemu_riscv.bb

diff --git a/conf/machine/freedom-u540.conf b/conf/machine/freedom-u540.conf
index aa791c7..4a53731 100644
--- a/conf/machine/freedom-u540.conf
+++ b/conf/machine/freedom-u540.conf
@@ -13,7 +13,6 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-riscv"
 PREFERRED_VERSION_linux-riscv ?= "4.18%"
 
 GDBVERSION = "riscv"
-QEMUVERSION = "riscv"
 
 EXTRA_IMAGEDEPENDS += "riscv-pk"
 
diff --git a/conf/machine/qemuriscv64.conf b/conf/machine/qemuriscv64.conf
index f5b6b5b..779dc5e 100644
--- a/conf/machine/qemuriscv64.conf
+++ b/conf/machine/qemuriscv64.conf
@@ -13,7 +13,6 @@ MACHINE_FEATURES = "screen keyboard ext2 ext3 serial"
 KERNEL_IMAGETYPE = "vmlinux"
 
 GDBVERSION = "riscv"
-#QEMUVERSION = "riscv"
 
 SERIAL_CONSOLES = "115200;ttyS0 115200;hvc0"
 
diff --git a/conf/machine/riscv32.conf b/conf/machine/riscv32.conf
index ad63b42..820574a 100644
--- a/conf/machine/riscv32.conf
+++ b/conf/machine/riscv32.conf
@@ -11,7 +11,6 @@ PREFERRED_VERSION_qemu-native = "${QEMUVERSION}"
 PREFERRED_VERSION_nativesdk-qemu = "${QEMUVERSION}"
 
 GDBVERSION = "riscv"
-QEMUVERSION = "riscv"
 
 # qemuboot options
 QB_MACHINE = "-machine virt"
diff --git a/conf/machine/riscv64.conf b/conf/machine/riscv64.conf
index 75dabc6..0aab455 100644
--- a/conf/machine/riscv64.conf
+++ b/conf/machine/riscv64.conf
@@ -11,7 +11,6 @@ PREFERRED_VERSION_qemu-native = "${QEMUVERSION}"
 PREFERRED_VERSION_nativesdk-qemu = "${QEMUVERSION}"
 
 GDBVERSION = "riscv"
-QEMUVERSION = "riscv"
 
 # qemuboot options
 QB_MACHINE = "-machine virt"
diff --git a/recipes-devtools/qemu/qemu_riscv.bb b/recipes-devtools/qemu/qemu_riscv.bb
deleted file mode 100644
index 17dd6c0..0000000
--- a/recipes-devtools/qemu/qemu_riscv.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require recipes-devtools/qemu/qemu.inc
-
-SRC_URI = "gitsm://github.com/riscv/riscv-qemu.git;destsuffix=${S};branch=master;rebaseable=1 \
-          "
-SRCREV = "62b9b076d9d37117696ec64f0b3544c1205ff7f9"
-
-SRC_URI_remove_class-native = "\
-    file://fix-libcap-header-issue-on-some-distro.patch \
-    file://cpus.c-qemu_cpu_kick_thread_debugging.patch \
-    "
-
-LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac"
-
-QEMU_TARGETS = "riscv64 riscv32"
-
-EXTRA_OECONF_remove = "--disable-numa --disable-lzo --disable-opengl --disable-gnutls --disable-static"
-
-do_install_append() {
-    # Prevent QA warnings about installed ${localstatedir}/run
-    if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi
-}
-
-COMPATIBLE_HOST_class-target = "(riscv64|riscv32).*-linux"