From f154b9854f996b4774f80348a5808d0569a1c60c Mon Sep 17 00:00:00 2001
From: Alistair Francis <alistair.francis@xilinx.com>
Date: Tue, 20 Dec 2016 11:54:21 -0800
Subject: qemu-devicetrees: Update to Xilinx's 2016.4 release

Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
---
 recipes-devtools/qemu/qemu-devicetrees_2.2.5.bb | 34 -----------------------
 recipes-devtools/qemu/qemu-devicetrees_2.6.0.bb | 36 +++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 34 deletions(-)
 delete mode 100644 recipes-devtools/qemu/qemu-devicetrees_2.2.5.bb
 create mode 100644 recipes-devtools/qemu/qemu-devicetrees_2.6.0.bb

diff --git a/recipes-devtools/qemu/qemu-devicetrees_2.2.5.bb b/recipes-devtools/qemu/qemu-devicetrees_2.2.5.bb
deleted file mode 100644
index 377e86ec..00000000
--- a/recipes-devtools/qemu/qemu-devicetrees_2.2.5.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-SUMMARY = "Xilinx's hardware device trees required for QEMU"
-HOMEPAGE = "https://github.com/xilinx/qemu-devicetrees/"
-LICENSE = "BSD"
-DEPENDS += "dtc-native"
-
-inherit deploy
-
-LIC_FILES_CHKSUM = "file://Makefile;beginline=1;endline=27;md5=7348b6cbcae69912cb1dee68d6c68d99"
-
-# This is the commit used in the 2016.3 tag
-SRCREV = "46faf58cd14cdfd06cae7c076cb486af8565ab6a"
-SRC_URI = "git://github.com/Xilinx/qemu-devicetrees.git;protocol=https;nobranch=1"
-
-S = "${WORKDIR}/git"
-
-# Don't need to do anything
-do_install() {
-	:
-}
-
-do_deploy() {
-	for DTS_FILE in ${S}/LATEST/SINGLE_ARCH/*.dtb; do
-		if [ ! -f ${DTS_FILE} ]; then
-			bbwarn "${DTS_FILE} is not available!"
-			continue
-		fi
-		DTS_NAME=`basename -s .dtb ${DTS_FILE}`
-		install -d ${DEPLOYDIR}
-		install -d ${DEPLOYDIR}/qemu-hw-devicetrees
-		install -m 0644 ${S}/LATEST/SINGLE_ARCH/${DTS_NAME}.dtb ${DEPLOYDIR}/qemu-hw-devicetrees/${DTS_NAME}.dtb
-	done
-}
-
-addtask deploy after do_install
diff --git a/recipes-devtools/qemu/qemu-devicetrees_2.6.0.bb b/recipes-devtools/qemu/qemu-devicetrees_2.6.0.bb
new file mode 100644
index 00000000..db23c204
--- /dev/null
+++ b/recipes-devtools/qemu/qemu-devicetrees_2.6.0.bb
@@ -0,0 +1,36 @@
+SUMMARY = "Xilinx's hardware device trees required for QEMU"
+HOMEPAGE = "https://github.com/xilinx/qemu-devicetrees/"
+LICENSE = "BSD"
+DEPENDS += "dtc-native"
+
+inherit deploy
+
+LIC_FILES_CHKSUM = "file://Makefile;beginline=1;endline=27;md5=7348b6cbcae69912cb1dee68d6c68d99"
+
+XILINX_RELEASE_VERSION = "v2016.4"
+SRCREV = "1085e32a9ddc232963512923332094a58a05d1af"
+SRC_URI = "git://github.com/Xilinx/qemu-devicetrees.git;protocol=https;nobranch=1"
+
+S = "${WORKDIR}/git"
+
+PV = "2.6.0-xilinx-${XILINX_RELEASE_VERSION}+git+${SRCPV}"
+
+# Don't need to do anything
+do_install() {
+	:
+}
+
+do_deploy() {
+	for DTS_FILE in ${S}/LATEST/SINGLE_ARCH/*.dtb; do
+		if [ ! -f ${DTS_FILE} ]; then
+			bbwarn "${DTS_FILE} is not available!"
+			continue
+		fi
+		DTS_NAME=`basename -s .dtb ${DTS_FILE}`
+		install -d ${DEPLOYDIR}
+		install -d ${DEPLOYDIR}/qemu-hw-devicetrees
+		install -m 0644 ${S}/LATEST/SINGLE_ARCH/${DTS_NAME}.dtb ${DEPLOYDIR}/qemu-hw-devicetrees/${DTS_NAME}.dtb
+	done
+}
+
+addtask deploy after do_install
-- 
cgit v1.2.3-54-g00ecf