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>

26 files changed, 28 insertions, 39 deletions

diff --git a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2020.1.bb b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2020.2.bb
index 1d94c518..201b6496 100644
--- a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2020.1.bb
+++ b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2020.2.bb
@@ -1,6 +1,6 @@
 ATF_VERSION = "2.0"
 BRANCH ?= "xlnx_rebase_v2.2"
-SRCREV ?= "5918e656ef29dbdf234a6324ec85bc8a68eca113"
+SRCREV ?= "e6eea88b14aaf456c49f9c7e6747584224648cb9"
 
 include arm-trusted-firmware.inc
 
diff --git a/meta-xilinx-bsp/recipes-bsp/bootgen/bootgen_1.0.bb b/meta-xilinx-bsp/recipes-bsp/bootgen/bootgen_1.0.bb
index 4904a8e0..ad29d3bf 100644
--- a/meta-xilinx-bsp/recipes-bsp/bootgen/bootgen_1.0.bb
+++ b/meta-xilinx-bsp/recipes-bsp/bootgen/bootgen_1.0.bb
@@ -2,7 +2,7 @@ SUMMARY = "Building and installing bootgen"
 DESCRIPTION = "Building and installing bootgen, a Xilinx tool that lets you stitch binary files together and generate device boot images"
 
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=be5410bcde8eb6481a6e5d3b22e0740b"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d526b6d0807bf263b97da1da876f39b1"
 
 S = "${WORKDIR}/git"
 
@@ -11,7 +11,7 @@ RDEPENDS_${PN} += "openssl"
 
 REPO ?= "git://github.com/Xilinx/bootgen.git;protocol=https"
 BRANCH ?= "master"
-SRCREV ?= "bb38995468d8c830cbbfc5062e903961444c0a3c"
+SRCREV ?= "f46a1b71e5121327c2c3e0d3995c9e055a1e4a96"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
diff --git a/meta-xilinx-bsp/recipes-bsp/reference-design/kc705-bitstream_2020.1.bb b/meta-xilinx-bsp/recipes-bsp/reference-design/kc705-bitstream_2020.2.bb
index 6a2ca7cc..6a2ca7cc 100644
--- a/meta-xilinx-bsp/recipes-bsp/reference-design/kc705-bitstream_2020.1.bb
+++ b/meta-xilinx-bsp/recipes-bsp/reference-design/kc705-bitstream_2020.2.bb
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.1.bb b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.2.bb
index 0eb66c8a..9e289a08 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.1.bb
+++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.2.bb
@@ -2,7 +2,7 @@ UBOOT_VERSION = "v2020.01"
 
 UBRANCH ?= "xlnx_rebase_v2020.01"
 
-SRCREV ?= "86c84c0d0f916ec00d5d76a32dc9372a25429ca9"
+SRCREV ?= "bb4660c33aa7ea64f78b2682bf0efd56765197d6"
 
 include u-boot-xlnx.inc
 include u-boot-spl-zynq-init.inc
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
diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2020.1.bb b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2020.1.bb
deleted file mode 100644
index b844f202..00000000
--- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2020.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-LINUX_VERSION = "5.4"
-SRCREV ?= "22b71b41620dac13c69267d2b7898ebfb14c954e"
-
-include linux-xlnx.inc
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI_append = " \
-        file://perf-fix-build-with-binutils.patch \
-        file://0001-perf-bench-Share-some-global-variables-to-fix-build-.patch \
-        file://0001-perf-tests-bp_account-Make-global-variable-static.patch \
-        file://0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch \
-        file://0001-libtraceevent-Fix-build-with-binutils-2.35.patch \
-"
-
-
diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2020.2.bb b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2020.2.bb
new file mode 100644
index 00000000..f3058a9a
--- /dev/null
+++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2020.2.bb
@@ -0,0 +1,5 @@
+LINUX_VERSION = "5.4"
+SRCREV ?= "62ea514294a0c9a80455e51f1f4de36e66e8c546"
+
+include linux-xlnx.inc
+
diff --git a/meta-xilinx-bsp/recipes-multimedia/vcu/kernel-module-vcu.bb b/meta-xilinx-bsp/recipes-multimedia/vcu/kernel-module-vcu.bb
index d7208257..817aa380 100644
--- a/meta-xilinx-bsp/recipes-multimedia/vcu/kernel-module-vcu.bb
+++ b/meta-xilinx-bsp/recipes-multimedia/vcu/kernel-module-vcu.bb
@@ -9,9 +9,9 @@ PV = "${XILINX_VCU_VERSION}-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
-BRANCH ?= "release-2020.1"
+BRANCH ?= "release-2020.2"
 REPO ?= "git://github.com/xilinx/vcu-modules.git;protocol=https"
-SRCREV ?= "38827a9172cfb1f0243547c04b2babc045d411ee"
+SRCREV ?= "844d4c4292e08ad8c3f22ac78e9a937395c1db4b"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
diff --git a/meta-xilinx-bsp/recipes-multimedia/vcu/libomxil-xlnx.bb b/meta-xilinx-bsp/recipes-multimedia/vcu/libomxil-xlnx.bb
index 49b8ef6f..b52bdf04 100644
--- a/meta-xilinx-bsp/recipes-multimedia/vcu/libomxil-xlnx.bb
+++ b/meta-xilinx-bsp/recipes-multimedia/vcu/libomxil-xlnx.bb
@@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=03a7aef7e6f6a76a59fd9b8ba450b493"
 XILINX_VCU_VERSION = "1.0.0"
 PV = "${XILINX_VCU_VERSION}-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}"
 
-BRANCH ?= "release-2020.1"
+BRANCH ?= "release-2020.2"
 REPO   ?= "git://github.com/xilinx/vcu-omx-il.git;protocol=https"
-SRCREV ?= "b5ffa7ec36814cb52c1616dffea2c4ced51fee19"
+SRCREV ?= "4e9daf282a12ecba19fe12f296a31315f6a6bd2d"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
diff --git a/meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb b/meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb
index 54fe19a9..10b9a4d8 100644
--- a/meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb
+++ b/meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb
@@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=03a7aef7e6f6a76a59fd9b8ba450b493"
 XILINX_VCU_VERSION = "1.0.0"
 PV = "${XILINX_VCU_VERSION}-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}"
 
-BRANCH ?= "release-2020.1"
+BRANCH ?= "release-2020.2"
 REPO   ?= "git://github.com/xilinx/vcu-ctrl-sw.git;protocol=https"
-SRCREV ?= "8ad2b1323bdc98d580360e1a01006d70625c4e65"
+SRCREV ?= "b82de3783fe66ee72f28b51313e8b42827d3f202"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
diff --git a/meta-xilinx-bsp/recipes-multimedia/vcu/vcu-firmware.bb b/meta-xilinx-bsp/recipes-multimedia/vcu/vcu-firmware.bb
index e29bfb79..87c0475a 100644
--- a/meta-xilinx-bsp/recipes-multimedia/vcu/vcu-firmware.bb
+++ b/meta-xilinx-bsp/recipes-multimedia/vcu/vcu-firmware.bb
@@ -8,9 +8,9 @@ PV = "${XILINX_VCU_VERSION}-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}"
 
 S  = "${WORKDIR}/git"
 
-BRANCH ?= "release-2020.1"
+BRANCH ?= "release-2020.2"
 REPO ?= "git://github.com/xilinx/vcu-firmware.git;protocol=https"
-SRCREV ?= "7ecfd476deb054f354791cc1300ccba069e234f5"
+SRCREV ?= "4e0bb53eba9ad84bf113a2efc12a4539e980f2c9"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI   = "${REPO};${BRANCHARG}"
diff --git a/meta-xilinx-bsp/recipes-xrt/xrt/xrt_git.bb b/meta-xilinx-bsp/recipes-xrt/xrt/xrt_git.bb
index d891c272..ddca7f93 100644
--- a/meta-xilinx-bsp/recipes-xrt/xrt/xrt_git.bb
+++ b/meta-xilinx-bsp/recipes-xrt/xrt/xrt_git.bb
@@ -9,15 +9,15 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=da5408f748bce8a9851dac18e66f4bcf \
                     file://runtime_src/core/pcie/tools/xbutil/LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87 \
                     file://runtime_src/core/edge/tools/xbutil/LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87 "
 
-BRANCH ?= "2020.1_PU1"
+BRANCH ?= "2020.2"
 REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/xrt:"
 SRC_URI_append = " file://0001-Replace-boost-detail-endian.hpp-with-boost-predef-ot.patch"
-PV = "202010.2.7.0"
-SRCREV ?= "8a4c6eb5012c57423fba468e1af8df53a293dcd5"
+PV = "202020.2.8.0"
+SRCREV ?= "8cdaafacc3fd0f6f9e6386dd56297c36e1554995"
 
 S = "${WORKDIR}/git/src"
 
diff --git a/meta-xilinx-bsp/recipes-xrt/zocl/zocl_git.bb b/meta-xilinx-bsp/recipes-xrt/zocl/zocl_git.bb
index f7a07888..aa183059 100644
--- a/meta-xilinx-bsp/recipes-xrt/zocl/zocl_git.bb
+++ b/meta-xilinx-bsp/recipes-xrt/zocl/zocl_git.bb
@@ -4,13 +4,13 @@ DESCRIPTION = "Xilinx Runtime driver module provides memory management and compu
 LICENSE = "GPLv2 & Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8"
 
-BRANCH ?= "2020.1_PU1"
+BRANCH ?= "2020.2"
 REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
 
-PV = "202010.2.7.0"
-SRCREV ?= "8a4c6eb5012c57423fba468e1af8df53a293dcd5"
+PV = "202020.2.8.0"
+SRCREV ?= "8cdaafacc3fd0f6f9e6386dd56297c36e1554995"
 
 S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl"
 
diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2020.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2020.2/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
index 660bc218..660bc218 100644
--- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2020.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
+++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2020.2/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2020.1/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2020.2/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
index 9b6229db..9b6229db 100644
--- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2020.1/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
+++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2020.2/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2020.1/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2020.2/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
index a98d84c5..a98d84c5 100644
--- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2020.1/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
+++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2020.2/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2020.1/0004-minized-wifi-bluetooth.cfg b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2020.2/0004-minized-wifi-bluetooth.cfg
index f71e53ab..f71e53ab 100644
--- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2020.1/0004-minized-wifi-bluetooth.cfg
+++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2020.2/0004-minized-wifi-bluetooth.cfg
diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2020.1.bbappend b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2020.2.bbappend
index 535fbb26..535fbb26 100644
--- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2020.1.bbappend
+++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2020.2.bbappend
diff --git a/meta-xilinx-standalone/recipes-standalone/plm/plm_2020.1.bb b/meta-xilinx-standalone/recipes-standalone/plm/plm_2020.2.bb
index c5a68ef1..c5a68ef1 100644
--- a/meta-xilinx-standalone/recipes-standalone/plm/plm_2020.1.bb
+++ b/meta-xilinx-standalone/recipes-standalone/plm/plm_2020.2.bb
diff --git a/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2020.1.bb b/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2020.2.bb
index 652241c0..652241c0 100644
--- a/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2020.1.bb
+++ b/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2020.2.bb
diff --git a/meta-xilinx-standalone/recipes-standalone/psm-firmware/psm-firmware_2020.1.bb b/meta-xilinx-standalone/recipes-standalone/psm-firmware/psm-firmware_2020.2.bb
index cd346b12..cd346b12 100644
--- a/meta-xilinx-standalone/recipes-standalone/psm-firmware/psm-firmware_2020.1.bb
+++ b/meta-xilinx-standalone/recipes-standalone/psm-firmware/psm-firmware_2020.2.bb