Update commit id and branch for components for 2020.2 release

Update commitid and branch for the following components:
arm-trusted-firmware, vcu, linux-xlnx, qemu, u-boot-xlnx,xrt,zocl,bootgen

git cherry-pick 9f8d8d7
Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>

6 files changed, 5 insertions, 6 deletions

diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2020.1.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2020.1.bb
deleted file mode 100644
index 26914f5a..00000000
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2020.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require qemu-devicetrees.inc
-
-BRANCH ?= "master"
-SRCREV ?= "${AUTOREV}"
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2020.2.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2020.2.bb
new file mode 100644
index 00000000..c7fc70b3
--- /dev/null
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2020.2.bb
@@ -0,0 +1,4 @@
+require qemu-devicetrees.inc
+
+BRANCH ?= "branch/xilinx-v2020.2"
+SRCREV ?= "0097f0f651d67b3a8495693e9e17c443948d3c77"
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native_2020.1.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native_2020.2.bb
index 45d474d1..45d474d1 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native_2020.1.bb
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native_2020.2.bb
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-system-native_2020.1.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-system-native_2020.2.bb
index 93afebed..93afebed 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-system-native_2020.1.bb
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-system-native_2020.2.bb
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc
index d7b495b6..c22c43c0 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc
@@ -10,14 +10,13 @@ LIC_FILES_CHKSUM = " \
                 "
 DEPENDS = "glib-2.0 zlib pixman"
 
-XILINX_QEMU_VERSION ?= "v4.1.50"
+XILINX_QEMU_VERSION ?= "v5.1.0"
 BRANCH ?= "master"
 SRCREV ?= "${AUTOREV}"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 PV = "${XILINX_QEMU_VERSION}-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}"
-BRANCH ?= ""
 REPO ?= "gitsm://github.com/Xilinx/qemu.git;protocol=https"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2020.1.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2020.2.bb
index 09f431ec..09f431ec 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2020.1.bb
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2020.2.bb