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

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

11 files changed, 74 insertions, 53 deletions

diff --git a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb
index fffe8056..f69ed50c 100644
--- a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb
+++ b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb
@@ -1,5 +1,5 @@
 ATF_VERSION = "2.4"
-SRCREV = "799131a3b063f6f24f87baa74e46906c076aebcd"
+SRCREV = "9188496b9b23a665782bb3d2c2b9e3b29b7fb4e2"
 BRANCH = "xlnx_rebase_v2.4"
 LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
 
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 4c4c8ade..be8f114b 100644
--- a/meta-xilinx-bsp/recipes-bsp/bootgen/bootgen_1.0.bb
+++ b/meta-xilinx-bsp/recipes-bsp/bootgen/bootgen_1.0.bb
@@ -11,7 +11,7 @@ RDEPENDS_${PN} += "openssl"
 
 REPO ?= "git://github.com/Xilinx/bootgen.git;protocol=https"
 BRANCH ?= "xlnx_rel_v2021.2"
-SRCREV = "f196bddc500dfb244aeabba264e66358c35d51dd"
+SRCREV = "5b6fe16a2bfd7ced4d90b70b0ba6fbf325e81e97"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
diff --git a/meta-xilinx-bsp/recipes-kernel/dp/kernel-module-dp_git.bb b/meta-xilinx-bsp/recipes-kernel/dp/kernel-module-dp_git.bb
index 75242299..37408751 100755
--- a/meta-xilinx-bsp/recipes-kernel/dp/kernel-module-dp_git.bb
+++ b/meta-xilinx-bsp/recipes-kernel/dp/kernel-module-dp_git.bb
@@ -11,7 +11,7 @@ S = "${WORKDIR}/git"
 
 BRANCH ?= "master"
 REPO   ?= "git://github.com/xilinx/dp-modules.git;protocol=https"
-SRCREV ?= "249a69434cef40308deda8460274d4d73a7e29f2"
+SRCREV ?= "46d4790c3d37ad4b878c5a1704df26edb56314f5"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
diff --git a/meta-xilinx-bsp/recipes-kernel/lopper/lopper.bb b/meta-xilinx-bsp/recipes-kernel/lopper/lopper.bb
index 6270a0f3..06949486 100644
--- a/meta-xilinx-bsp/recipes-kernel/lopper/lopper.bb
+++ b/meta-xilinx-bsp/recipes-kernel/lopper/lopper.bb
@@ -17,11 +17,11 @@ RDEPENDS_${PN} += " \
     python3-humanfriendly \
 "
 
-SRC_URI = "git://github.com/devicetree-org/lopper.git;branch=master"
+SRC_URI = "git://github.com/devicetree-org/lopper.git;branch=v0.2021.x"
 
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=8e5f5f691f01c9fdfa7a7f2d535be619"
 
-SRCREV = "d2fedbb72c7e54bfb1f823cb17b28b69970b2808"
+SRCREV = "b17818f1e5f979fa1fee4452085139b15d65074d"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb b/meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb
index 8ddd24bc..63f790c0 100644
--- a/meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb
+++ b/meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb
@@ -8,7 +8,7 @@ PV = "${XILINX_VCU_VERSION}-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}"
 
 BRANCH ?= "master"
 REPO   ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https"
-SRCREV = "3ae40aa1167f98be5e0cb3c23065d29860929b79"
+SRCREV = "372f702dc2983f42d219ce37000eae4b0515ec85"
 
 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 e9d4fdaa..c48c3101 100644
--- a/meta-xilinx-bsp/recipes-multimedia/vcu/vcu-firmware.bb
+++ b/meta-xilinx-bsp/recipes-multimedia/vcu/vcu-firmware.bb
@@ -10,7 +10,7 @@ S  = "${WORKDIR}/git"
 
 BRANCH ?= "master"
 REPO ?= "git://github.com/Xilinx/vcu-firmware.git;protocol=https"
-SRCREV = "46f26a8fc8c660e247ab029aafcd951c400dd090"
+SRCREV = "17ef70e3a52b972f2c1f821f7b20d2f7af003711"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI   = "${REPO};${BRANCHARG}"
diff --git a/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc b/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc
index d17f747c..ee7492ea 100644
--- a/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc
+++ b/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc
@@ -6,7 +6,8 @@ ESW_VER = "experimental"
 
 REPO = "git://github.com/Xilinx/embeddedsw-experimental-dt-support.git;protocol=https"
 
-ESW_BRANCH[experimental] = "master"
-ESW_REV[experimental] = "3ada5314f2d3b5e2d32f21bf56997a09abbb640c"
+ESW_BRANCH[experimental] = "xilinx-v2021.1-sdt-experimental"
+ESW_REV[experimental] = "329bf8fa54110034c8436d0b3b4aa40e8a56b02d"
 LIC_FILES_CHKSUM[master] = '7c92de7a21a6613265035c28f4a92f48'
+LIC_FILES_CHKSUM[xilinx-v2021.1-sdt-experimental] = '7c92de7a21a6613265035c28f4a92f48'
 
diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup b/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup
index a316ecc1..894f08c8 100644
--- a/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup
+++ b/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup
@@ -1,4 +1,4 @@
-Document Version: 20210920
+Document Version: 20210930
 
 The Yocto Project setup for the new workflow is as follows.  Be sure to read
 everything below, as the steps will be updated in the future if the
@@ -39,21 +39,28 @@ however you may use any path you wish.
 <build>/prestep/dt-processor.sh <path_to_conf> <dtb>
 
 # For example, zynqmp:
-# <build>/prestep/dt-processor.sh <build>/conf <device-tree>/zu-sep13-sdt/system-top.dts
+# <build>/prestep/dt-processor.sh <build>/conf <device-tree>/zu-sdt/system-top.dts
 #
 # Follow the instructions returned by the script!
 # Such as:
-#To enable this, add the following to your local.conf:
-#
-#require conf/cortexa53-zynqmp-linux.conf
-#SYSTEM_DTFILE = "/proj/yocto/zu-sep13-sdt/system-top.dts"
-#BBMULTICONFIG += " cortexa53-zynqmp-fsbl-baremetal cortexa53-zynqmp-baremetal cortexr5-zynqmp-baremetal microblaze-pmu"
-#FSBL_DEPENDS = ""
-#FSBL_MCDEPENDS = "mc::cortexa53-zynqmp-fsbl-baremetal:fsbl-firmware:do_deploy"
-#FSBL_DEPLOY_DIR = "${TOPDIR}/tmp-cortexa53-zynqmp-fsbl-baremetal/deploy/images/${MACHINE}"
-#PMU_DEPENDS = ""
-#PMU_MCDEPENDS = "mc::microblaze-pmu:pmu-firmware:do_deploy"
-#PMU_FIRMWARE_DEPLOY_DIR = "${TOPDIR}/tmp-microblaze-pmu/deploy/images/${MACHINE}"
+
+To enable this, add the following to your local.conf:
+
+# Adjust BASE_TMPDIR if you want to move the tmpdirs elsewhere
+BASE_TMPDIR = "${TOPDIR}"
+require conf/cortexa53-zynqmp-linux.conf
+SYSTEM_DTFILE = "/proj/yocto/zu_sdt/system-top.dts"
+BBMULTICONFIG += " cortexa53-zynqmp-fsbl-baremetal cortexa53-zynqmp-baremetal cortexa53-zynqmp-freertos cortexr5-zynqmp-fsbl-baremetal cortexr5-zynqmp-baremetal cortexr5-zynqmp-freertos microblaze-pmu"
+FSBL_DEPENDS = ""
+FSBL_MCDEPENDS = "mc::cortexa53-zynqmp-fsbl-baremetal:fsbl-firmware:do_deploy"
+FSBL_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-cortexa53-zynqmp-fsbl-baremetal/deploy/images/${MACHINE}"
+R5FSBL_DEPENDS = ""
+R5FSBL_MCDEPENDS = "mc::cortexr5-zynqmp-fsbl-baremetal:fsbl-firmware:do_deploy"
+R5FSBL_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-cortexr5-zynqmp-fsbl-baremetal/deploy/images/${MACHINE}"
+PMU_DEPENDS = ""
+PMU_MCDEPENDS = "mc::microblaze-pmu:pmu-firmware:do_deploy"
+PMU_FIRMWARE_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-microblaze-pmu/deploy/images/${MACHINE}"
+
 #
 # OR
 #
@@ -62,18 +69,21 @@ however you may use any path you wish.
 #
 # Follow the instructions returned by the script!
 # Such as:
-#To enable this, add the following to your local.conf:
-#
-#require conf/cortexa72-versal-linux.conf
-#SYSTEM_DTFILE = "/proj/yocto/vck190-sdt/system-top.dts"
-#BBMULTICONFIG += " cortexa72-versal-baremetal microblaze-pmc microblaze-psm cortexr5-versal-baremetal"
-#PLM_DEPENDS = ""
-#PLM_MCDEPENDS = "mc::microblaze-pmc:plm-firmware:do_deploy"
-#PLM_DEPLOY_DIR = "${TOPDIR}/tmp-microblaze-pmc/deploy/images/${MACHINE}"
-#PSM_DEPENDS = ""
-#PSM_MCDEPENDS = "mc::microblaze-psm:psm-firmware:do_deploy"
-#PSM_FIRMWARE_DEPLOY_DIR = "${TOPDIR}/tmp-microblaze-psm/deploy/images/${MACHINE}"
-#PDI_PATH = "__PATH TO PDI FILE HERE__"
+
+To enable this, add the following to your local.conf:
+
+# Adjust BASE_TMPDIR if you want to move the tmpdirs elsewhere
+BASE_TMPDIR = "${TOPDIR}"
+require conf/cortexa72-versal-linux.conf
+SYSTEM_DTFILE = "/proj/yocto/mhatle/DTB-FLOW/testing/vck190-sdt/system-top.dts"
+BBMULTICONFIG += " cortexa72-versal-baremetal cortexa72-versal-freertos microblaze-pmc microblaze-psm cortexr5-versal-baremetal cortexr5-versal-freertos"
+PLM_DEPENDS = ""
+PLM_MCDEPENDS = "mc::microblaze-pmc:plm-firmware:do_deploy"
+PLM_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-microblaze-pmc/deploy/images/${MACHINE}"
+PSM_DEPENDS = ""
+PSM_MCDEPENDS = "mc::microblaze-psm:psm-firmware:do_deploy"
+PSM_FIRMWARE_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-microblaze-psm/deploy/images/${MACHINE}"
+PDI_PATH = "__PATH TO PDI FILE HERE__"
 
 # NOTE: On versal, you MUST specify the PDI file as directed by the instructions.
 # such as: PDI_PATH = "__PATH TO PDI FILE HERE__"
diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh b/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh
index fe37c4df..7712f9a8 100755
--- a/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh
+++ b/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh
@@ -100,13 +100,15 @@ cortex_a53_linux() {
 CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
 MACHINE = "${machine}-generic"
 # Override the SYSTEM_DTFILE for Linux builds
-SYSTEM_DTFILE = "${CONFIG_DTFILE}"
+SYSTEM_DTFILE_linux = "\${CONFIG_DTFILE}"
 # We don't want the kernel to build us a device-tree
 KERNEL_DEVICETREE_${machine}-generic = ""
 # We need u-boot to use the one we passed in
 DEVICE_TREE_NAME_pn-u-boot-zynq-scr = "\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}"
 # Update bootbin to use proper device tree
 BIF_PARTITION_IMAGE[device-tree] = "\${RECIPE_SYSROOT}/boot/devicetree/\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}"
+# Remap boot files to ensure the right device tree is listed first
+IMAGE_BOOT_FILES = "devicetree/\${@os.path.basename(d.getVar('CONFIG_DTFILE'))} \${@get_default_image_boot_files(d)}"
 EOF
 }
 
@@ -135,7 +137,7 @@ cortex_a53_baremetal() {
   fi
   if [ $1 = "fsbl" ]; then
     fsbl_mcdepends="mc::${dtb_file%%.dtb}:fsbl-firmware:do_deploy"
-    fsbl_deploy_dir="\${TOPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
+    fsbl_deploy_dir="\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
   fi
 
   # Build device tree
@@ -152,7 +154,7 @@ CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
 ESW_MACHINE = "cortexa53-${machine}"
 DEFAULTTUNE = "cortexa53"
 
-TMPDIR = "\${TOPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
 
 DISTRO = "$yocto_distro"
 
@@ -190,7 +192,7 @@ CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
 ESW_MACHINE = "cortexa53-${machine}"
 DEFAULTTUNE = "cortexa53"
 
-TMPDIR = "\${TOPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
 
 DISTRO = "xilinx-freertos"
 
@@ -229,13 +231,15 @@ cortex_a72_linux() {
 CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
 MACHINE = "${machine}-generic"
 # Override the SYSTEM_DTFILE for Linux builds
-SYSTEM_DTFILE = "${CONFIG_DTFILE}"
+SYSTEM_DTFILE_linux = "\${CONFIG_DTFILE}"
 # We don't want the kernel to build us a device-tree
 KERNEL_DEVICETREE_${machine}-generic = ""
 # We need u-boot to use the one we passed in
 DEVICE_TREE_NAME_pn-u-boot-zynq-scr = "\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}"
 # Update bootbin to use proper device tree
 BIF_PARTITION_IMAGE[device-tree] = "\${RECIPE_SYSROOT}/boot/devicetree/\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}"
+# Remap boot files to ensure the right device tree is listed first
+IMAGE_BOOT_FILES = "devicetree/\${@os.path.basename(d.getVar('CONFIG_DTFILE'))} \${@get_default_image_boot_files(d)}"
 EOF
 }
 
@@ -268,7 +272,7 @@ CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
 ESW_MACHINE = "cortexa72-${machine}"
 DEFAULTTUNE = "cortexa72"
 
-TMPDIR = "\${TOPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
 
 DISTRO = "xilinx-standalone-nolto"
 
@@ -306,7 +310,7 @@ CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
 ESW_MACHINE = "cortexa72-${machine}"
 DEFAULTTUNE = "cortexa72"
 
-TMPDIR = "\${TOPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
 
 DISTRO = "xilinx-freertos"
 
@@ -342,7 +346,7 @@ cortex_r5_baremetal() {
 
   if [ $1 = "fsbl" ]; then
     r5fsbl_mcdepends="mc::${dtb_file%%.dtb}:fsbl-firmware:do_deploy"
-    r5fsbl_deploy_dir="\${TOPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
+    r5fsbl_deploy_dir="\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
   fi
   # Build device tree
   mkdir -p dtb
@@ -358,7 +362,7 @@ CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
 ESW_MACHINE = "cortexr5-${machine}"
 DEFAULTTUNE = "cortexr5f"
 
-TMPDIR = "\${TOPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
 
 DISTRO = "$yocto_distro"
 
@@ -396,7 +400,7 @@ CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
 ESW_MACHINE = "cortexr5-${machine}"
 DEFAULTTUNE = "cortexr5f"
 
-TMPDIR = "\${TOPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
 
 DISTRO = "xilinx-freertos"
 
@@ -429,7 +433,7 @@ pmu-microblaze() {
   distro="multiconfig/includes/microblaze-pmu-distro.conf"
 
   pmu_mcdepends="mc::${dtb_file%%.dtb}:pmu-firmware:do_deploy"
-  pmu_firmware_deploy_dir="\${TOPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
+  pmu_firmware_deploy_dir="\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
 
   # Build device tree
   mkdir -p dtb
@@ -450,7 +454,7 @@ TUNE_FEATURES_tune-microblaze_forcevariable = "\${TUNE_FEATURES_tune-pmu-microbl
 
 TARGET_CFLAGS += "-DPSU_PMU=1U"
 
-TMPDIR = "\${TOPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
 
 DISTRO = "xilinx-standalone"
 
@@ -468,7 +472,7 @@ pmc-microblaze() {
   distro="multiconfig/includes/microblaze-pmc-distro.conf"
 
   plm_mcdepends="mc::${dtb_file%%.dtb}:plm-firmware:do_deploy"
-  plm_deploy_dir="\${TOPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
+  plm_deploy_dir="\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
 
   # Build device tree
   mkdir -p dtb
@@ -489,7 +493,7 @@ TUNE_FEATURES_tune-microblaze_forcevariable = "\${TUNE_FEATURES_tune-pmc-microbl
 
 TARGET_CFLAGS += "-DVERSAL_PLM=1"
 
-TMPDIR = "\${TOPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
 
 DISTRO = "xilinx-standalone"
 
@@ -507,7 +511,7 @@ psm-microblaze() {
   distro="multiconfig/includes/microblaze-psm-distro.conf"
 
   psm_mcdepends="mc::${dtb_file%%.dtb}:psm-firmware:do_deploy"
-  psm_firmware_deploy_dir="\${TOPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
+  psm_firmware_deploy_dir="\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}/deploy/images/\${MACHINE}"
 
   # Build device tree
   mkdir -p dtb
@@ -528,7 +532,7 @@ TUNE_FEATURES_tune-microblaze_forcevariable = "\${TUNE_FEATURES_tune-psm-microbl
 
 TARGET_CFLAGS += "-DVERSAL_psm=1"
 
-TMPDIR = "\${TOPDIR}/tmp-${dtb_file%%.dtb}"
+TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}"
 
 DISTRO = "xilinx-standalone"
 
@@ -703,6 +707,8 @@ rm cpu-list.tmp
 
 echo "To enable this, add the following to your local.conf:"
 echo
+echo '# Adjust BASE_TMPDIR if you want to move the tmpdirs elsewhere'
+echo 'BASE_TMPDIR = "${TOPDIR}"'
 if [ -n "${system_conf}" ]; then
   echo "require ${system_conf}"
 fi
diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/meta-xilinx-setup.bb b/meta-xilinx-standalone-experimental/recipes-core/meta/meta-xilinx-setup.bb
index 86d988c6..81b0bf1a 100644
--- a/meta-xilinx-standalone-experimental/recipes-core/meta/meta-xilinx-setup.bb
+++ b/meta-xilinx-standalone-experimental/recipes-core/meta/meta-xilinx-setup.bb
@@ -45,6 +45,9 @@ do_populate_sdk[stamp-extra-info] = "${PACKAGE_ARCH}"
 
 REAL_MULTIMACH_TARGET_SYS = "none"
 
+# Needed to ensure README-setup and dt-processor.sh are available
+addtask do_populate_sdk after do_unpack
+
 create_sdk_files_append () {
         install -m 0644 ${WORKDIR}/README-setup ${SDK_OUTPUT}/${SDKPATH}/.
         install -m 0755 ${WORKDIR}/dt-processor.sh ${SDK_OUTPUT}/${SDKPATH}/.
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}"