Merge remote-tracking branch 'xilinx/rel-v2021.2' into 2022

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
index 3c2f2c1f..1fcd797b 100644
--- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
+++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
@@ -8,7 +8,7 @@ ESW_BRANCH[2019.2] = "release-2019.2"
 ESW_BRANCH[2020.1] = "release-2020.1"
 ESW_BRANCH[2020.2] = "master-rel-2020.2"
 ESW_BRANCH[2021.1] = "xlnx_rel_v2021.1"
-ESW_BRANCH[2021.2] = "xlnx_rel_v2021.2-next"
+ESW_BRANCH[2021.2] = "xlnx_rel_v2021.2"
 ESW_BRANCH[2022.1] = "master-next"
 ESW_BRANCH[git]    = "master-next"
 BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}"
@@ -18,7 +18,7 @@ ESW_REV[2019.2] = "e8db5fb118229fdc621e0ec7848641a23bf60998"
 ESW_REV[2020.1] = "338150ab3628a1ea6b06e964b16e712b131882dd"
 ESW_REV[2020.2] = "2516d5ed8161e16c2813b0e8e4ceac693f23de5c"
 ESW_REV[2021.1] = "d37a0e8824182597abf31ac3f1087a5321b33ad7"
-ESW_REV[2021.2] = "e768f2ddb0e45203ff5d00255d026191afdd9af9"
+ESW_REV[2021.2] = "49c6694fc3cab6b87dd564da58a83bb8656a7c03"
 ESW_REV[2022.1] = "c88eb4315cd8ff16aa3a29f537485f5631401dbc"
 ESW_REV[git]    = "7ec60e1c0e25bfa9c5e8c77d6d063876f6670770"
 SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}"
@@ -32,8 +32,9 @@ LIC_FILES_CHKSUM[release-2019.2]    = '39ab6ab638f4d1836ba994ec6852de94'
 LIC_FILES_CHKSUM[release-2020.1]    = '8b565227e1264d677db8f841c2948cba'
 LIC_FILES_CHKSUM[master-rel-2020.2] = '3a6e22aebf6516f0f74a82e1183f74f8'
 LIC_FILES_CHKSUM[xlnx_rel_v2021.1]  = "73e8997d53c2137fdeea4331a73f40fa"
-LIC_FILES_CHKSUM[xlnx_rel_v2021.2-next]  = '593ba3fb8be51271097ddaa4b9c65cde'
+LIC_FILES_CHKSUM[xlnx_rel_v2021.2]  = 'ba23909a4bcaf754a2e1ba996f1ca1b0'
 LIC_FILES_CHKSUM[master-next]       = '37d990653fd94329b115cc07303f332f'
+LIC_FILES_CHKSUM[master]            = '593ba3fb8be51271097ddaa4b9c65cde'
 LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}"
 
 SRC_URI = "${EMBEDDEDSW_SRCURI}"