Move from 2021.2 to 2022.1

Rename recipes from 2021.2 to 2022.1 as necessary.

Move internal references to 2022.1 (layer.conf and local.conf.sample)

Move kernel to 2022.1 branch, as well as various kernel modules.

Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>

28 files changed, 103 insertions, 42 deletions

diff --git a/meta-xilinx-bsp/reference-design/kc705-bitstream_2021.2.bb b/meta-xilinx-bsp/recipes-bsp/reference-design/kc705-bitstream_2022.1.bb
index e512777c..e512777c 100644
--- a/meta-xilinx-bsp/reference-design/kc705-bitstream_2021.2.bb
+++ b/meta-xilinx-bsp/recipes-bsp/reference-design/kc705-bitstream_2022.1.bb
diff --git a/meta-xilinx-contrib/conf/layer.conf b/meta-xilinx-contrib/conf/layer.conf
index b33fb0a5..026d79d2 100644
--- a/meta-xilinx-contrib/conf/layer.conf
+++ b/meta-xilinx-contrib/conf/layer.conf
@@ -14,4 +14,4 @@ LAYERDEPENDS_xilinx-contrib = "xilinx"
 
 LAYERSERIES_COMPAT_xilinx-contrib = "honister"
 
-XILINX_RELEASE_VERSION = "v2021.2"
+XILINX_RELEASE_VERSION = "v2022.1"
diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2021.2/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
index 660bc218..660bc218 100644
--- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2021.2/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
+++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2021.2/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
index 9b6229db..9b6229db 100644
--- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2021.2/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
+++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2021.2/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
index a98d84c5..a98d84c5 100644
--- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2021.2/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
+++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2021.2/0004-minized-wifi-bluetooth.cfg b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0004-minized-wifi-bluetooth.cfg
index f71e53ab..f71e53ab 100644
--- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2021.2/0004-minized-wifi-bluetooth.cfg
+++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2022.1/0004-minized-wifi-bluetooth.cfg
diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2021.2.bbappend b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2022.1.bbappend
index 2ce919ac..2ce919ac 100644
--- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2021.2.bbappend
+++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2022.1.bbappend
diff --git a/meta-xilinx-core/conf/local.conf.sample b/meta-xilinx-core/conf/local.conf.sample
index 5518196e..a7173fb8 100644
--- a/meta-xilinx-core/conf/local.conf.sample
+++ b/meta-xilinx-core/conf/local.conf.sample
@@ -206,11 +206,11 @@ BB_DISKMON_DIRS ??= "\
 #file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
 #file://.* file:///some/local/dir/sstate/PATH"
 
-XILINX_VER_MAIN = "2021.2"
+XILINX_VER_MAIN = "2022.1"
 
 # Uncomment below lines to provide path for custom xsct trim
 #
-#EXTERNAL_XSCT_TARBALL = "/proj/yocto/xsct-trim/2021.2_xsct_daily_latest"
+#EXTERNAL_XSCT_TARBALL = "/proj/yocto/xsct-trim/2022.1_xsct_daily_latest"
 #VALIDATE_XSCT_CHECKSUM = '0'
 
 #
diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2021.2.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb
index f69ed50c..f02bb879 100644
--- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2021.2.bb
+++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb
@@ -1,6 +1,6 @@
-ATF_VERSION = "2.4"
-SRCREV = "9188496b9b23a665782bb3d2c2b9e3b29b7fb4e2"
-BRANCH = "xlnx_rebase_v2.4"
+ATF_VERSION = "2.6"
+SRCREV = "67ca59c67f542322554d78820bf9ddaa736d6a84"
+BRANCH = "xlnx_rebase_v2.6"
 LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
 
 
diff --git a/meta-xilinx-core/recipes-bsp/bootgen/bootgen_1.0.bb b/meta-xilinx-core/recipes-bsp/bootgen/bootgen_1.0.bb
index 236da302..101d4ca2 100644
--- a/meta-xilinx-core/recipes-bsp/bootgen/bootgen_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/bootgen/bootgen_1.0.bb
@@ -10,8 +10,8 @@ DEPENDS += "openssl"
 RDEPENDS:${PN} += "openssl"
 
 REPO ?= "git://github.com/Xilinx/bootgen.git;protocol=https"
-BRANCH ?= "xlnx_rel_v2021.2"
-SRCREV = "5b6fe16a2bfd7ced4d90b70b0ba6fbf325e81e97"
+BRANCH ?= "xlnx_rel_v2022.1"
+SRCREV = "4eac958eb6c831ffa5768a0e2cd4be23c5efe2e0"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2021.2.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.1.bb
index a4fedbe2..e309783f 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2021.2.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.1.bb
@@ -1,8 +1,8 @@
 UBOOT_VERSION = "v2021.01"
 
-UBRANCH ?= "xlnx_rebase_v2021.01"
+UBRANCH ?= "xlnx_rebase_v2022.01"
 
-SRCREV = "63b6d260dbe64a005407439e2caeb32da9025954"
+SRCREV = "c50d6c48f4e1368cd38699278e35563cb4b0e444"
 
 include u-boot-xlnx.inc
 include u-boot-spl-zynq-init.inc
diff --git a/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx.bb b/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx.bb
index 79e0d90b..4acce149 100644
--- a/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx.bb
+++ b/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx.bb
@@ -12,7 +12,7 @@ PROVIDES += "virtual/libgles1 virtual/libgles2 virtual/egl virtual/libgbm"
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 REPO ?= "git://github.com/Xilinx/mali-userspace-binaries.git;protocol=https"
-BRANCH ?= "xlnx_rel_v2021.2"
+BRANCH ?= "xlnx_rel_v2022.1"
 SRCREV ?= "a1a22c9f03b20d8cb70b91727fe51c1db7f4b061"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 
diff --git a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_git.bb b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_git.bb
index 4d8bd265..ae11f694 100755
--- a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_git.bb
+++ b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_git.bb
@@ -4,14 +4,14 @@ SECTION = "kernel/modules"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
 
-XLNX_DP_VERSION = "5.10.0"
+XLNX_DP_VERSION = "5.15.19"
 PV = "${XLNX_DP_VERSION}"
 
 S = "${WORKDIR}/git"
 
-BRANCH ?= "xlnx_rel_v2021.2"
+BRANCH ?= "xlnx_rel_v2022.1"
 REPO   ?= "git://github.com/xilinx/dp-modules.git;protocol=https"
-SRCREV ?= "46d4790c3d37ad4b878c5a1704df26edb56314f5"
+SRCREV ?= "9a025fdb7134a8af12de8d69f5a428c8284ae9b3"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
diff --git a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_git.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_git.bb
index 65484fca..27a5ffdb 100644
--- a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_git.bb
+++ b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_git.bb
@@ -4,14 +4,14 @@ SECTION = "kernel/modules"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b34277fe156508fd5a650609dc36d1fe"
 
-XLNX_HDMI_VERSION = "5.10.0"
+XLNX_HDMI_VERSION = "5.15.19"
 PV = "${XLNX_HDMI_VERSION}"
 
 S = "${WORKDIR}/git"
 
-BRANCH ?= "xlnx_rel_v2021.2"
+BRANCH ?= "xlnx_rel_v2022.1"
 REPO   ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https"
-SRCREV = "aeb9f2c9a50c5e8dd4245454116c47f841f78825"
+SRCREV = "25b6fe7a26a975be15c002b48cfd4c291486491e"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx-dev.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx-dev.bb
index acb9938f..197cb208 100644
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx-dev.bb
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx-dev.bb
@@ -11,7 +11,7 @@ SRCREV ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-x
 # skip version sanity, because the version moves with AUTOREV
 KERNEL_VERSION_SANITY_SKIP = "1"
 
-LINUX_VERSION ?= "4.9+"
+LINUX_VERSION ?= "5.15+"
 LINUX_VERSION_EXTENSION ?= "-xilinx-dev"
 
 include linux-xlnx.inc
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc
index 4652154e..adefabea 100644
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc
@@ -4,16 +4,16 @@ LINUX_VERSION_EXTENSION ?= "-xilinx-${XILINX_RELEASE_VERSION}"
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
 # Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits
-KBRANCH ?= "xlnx_rebase_v5.10"
+KBRANCH ?= "xlnx_rebase_v5.15_LTS"
 SRCBRANCHARG = "${@['nobranch=1', 'branch=${KBRANCH}'][d.getVar('KBRANCH', True) != '']}"
 
 FILESOVERRIDES:append = ":${XILINX_RELEASE_VERSION}"
 KERNELURI ?= "git://github.com/Xilinx/linux-xlnx.git;protocol=https;name=machine"
-YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=yocto-kmeta"
+YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=yocto-kmeta"
 SRC_URI = "${KERNELURI};${SRCBRANCHARG} ${YOCTO_META}"
 
 SRCREV_machine ?= "${SRCREV}"
-SRCREV_meta ?= "20b185f6b5afbad309747a7901786e0231dc8195"
+SRCREV_meta ?= "eeb5d0c9dd5e2928835c633644426ee357fbce12"
 SRCREV_FORMAT = "machine"
 
 require recipes-kernel/linux/linux-yocto.inc
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2021.2.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2021.2.bb
deleted file mode 100644
index 660f6037..00000000
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2021.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-LINUX_VERSION = "5.10"
-KBRANCH="xlnx_rebase_v5.10"
-SRCREV = "568989d44176ae0a38ea78c16d0590c726d3b60a"
-
-KCONF_AUDIT_LEVEL="0"
-
-include linux-xlnx.inc
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.1.bb
new file mode 100644
index 00000000..60301f18
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.1.bb
@@ -0,0 +1,9 @@
+LINUX_VERSION = "5.15.19"
+KBRANCH="xlnx_rebase_v5.15_LTS"
+SRCREV = "b0c1be301e78c320df8c4d93b18393bfd7fd4e9d"
+
+KCONF_AUDIT_LEVEL="0"
+
+include linux-xlnx.inc
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu.bb b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu.bb
index 32a8e183..1114a49d 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu.bb
@@ -11,9 +11,9 @@ S = "${WORKDIR}/git"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-BRANCH = "xlnx_rel_v2021.2"
+BRANCH = "xlnx_rel_v2022.1"
 REPO = "git://github.com/Xilinx/vcu-modules.git;protocol=https"
-SRCREV = "e208ae31f663af77b1b703b3c038ce7bf812fa83"
+SRCREV = "9d2657550eccebccce08cacfcdd369367b9f6be4"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = " \
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx.bb b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx.bb
index 7d37c66a..958183a0 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx.bb
+++ b/meta-xilinx-core/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 ?= "xlnx_rel_v2021.2"
+BRANCH ?= "xlnx_rel_v2022.1"
 REPO   ?= "git://github.com/Xilinx/vcu-omx-il.git;protocol=https"
-SRCREV = "a9d452e772da6bc43f524230c79e6dc0f2442fd7"
+SRCREV = "b3308c608be7ed9250b9c6732f6e0a02b1a2e985"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx.bb
index 0a5ab35e..5608e5a8 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx.bb
+++ b/meta-xilinx-core/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 ?= "xlnx_rel_v2021.2"
+BRANCH ?= "xlnx_rel_v2022.1"
 REPO   ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https"
-SRCREV = "372f702dc2983f42d219ce37000eae4b0515ec85"
+SRCREV = "5bf158af204b181f00ac009c8745557642ecfe5f"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware.bb b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware.bb
index 2c4fc780..0013134d 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware.bb
@@ -8,9 +8,9 @@ PV = "${XILINX_VCU_VERSION}-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}"
 
 S  = "${WORKDIR}/git"
 
-BRANCH ?= "xlnx_rel_v2021.2"
+BRANCH ?= "xlnx_rel_v2022.1"
 REPO ?= "git://github.com/Xilinx/vcu-firmware.git;protocol=https"
-SRCREV = "17ef70e3a52b972f2c1f821f7b20d2f7af003711"
+SRCREV = "569f980527fd58f43baf16bd0b294bf8c7cdf963"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI   = "${REPO};${BRANCHARG}"
diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
index 15ddd0ae..1c2b6819 100644
--- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
+++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
@@ -9,7 +9,8 @@ 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"
-ESW_BRANCH[git]    = "xlnx_rel_v2021.2"
+ESW_BRANCH[2022.1] = "xlnx_rel_v2022.1"
+ESW_BRANCH[git]    = "xlnx_rel_v2022.1"
 BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}"
 
 ESW_REV[2019.1] = "26c14d9861010a0e3a55c73fb79efdb816eb42ca"
@@ -18,7 +19,8 @@ ESW_REV[2020.1] = "338150ab3628a1ea6b06e964b16e712b131882dd"
 ESW_REV[2020.2] = "2516d5ed8161e16c2813b0e8e4ceac693f23de5c"
 ESW_REV[2021.1] = "d37a0e8824182597abf31ac3f1087a5321b33ad7"
 ESW_REV[2021.2] = "49c6694fc3cab6b87dd564da58a83bb8656a7c03"
-ESW_REV[git]    = "49c6694fc3cab6b87dd564da58a83bb8656a7c03"
+ESW_REV[2022.1] = "b3d8b420b421730ea505da55b42174dc90f885c1"
+ESW_REV[git] = "b3d8b420b421730ea505da55b42174dc90f885c1"
 SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}"
 
 EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}"
@@ -31,7 +33,7 @@ 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]  = 'ba23909a4bcaf754a2e1ba996f1ca1b0'
-LIC_FILES_CHKSUM[master]            = '593ba3fb8be51271097ddaa4b9c65cde'
+LIC_FILES_CHKSUM[xlnx_rel_v2022.1]  = 'e62cb7a722c4430999e0a55a7234035d'
 LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}"
 
 SRC_URI = "${EMBEDDEDSW_SRCURI}"
diff --git a/meta-xilinx-standalone/conf/layer.conf b/meta-xilinx-standalone/conf/layer.conf
index 31db64a0..f7ebaca4 100644
--- a/meta-xilinx-standalone/conf/layer.conf
+++ b/meta-xilinx-standalone/conf/layer.conf
@@ -16,4 +16,4 @@ LAYERDEPENDS_xilinx-standalone = "core xilinx"
 LAYERRECOMMENDS_xilinx-standalone = "xilinx-microblaze"
 
 LAYERSERIES_COMPAT_xilinx-standalone = "honister"
-XILINX_RELEASE_VERSION = "v2021.2"
+XILINX_RELEASE_VERSION = "v2022.1"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.1.bb
new file mode 100644
index 00000000..3f9740a0
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.1.bb
@@ -0,0 +1,11 @@
+require fsbl-firmware.inc
+
+FILESPATH .= ":${FILE_DIRNAME}/embeddedsw"
+
+SRC_URI += " \
+            file://makefile-skip-copy_bsp.sh.patch \
+            file://fsbl-fixups.patch \
+           "
+
+# This version does not build for zynq
+COMPATIBLE_MACHINE:zynq = "none"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.1.bb
new file mode 100644
index 00000000..cc810241
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.1.bb
@@ -0,0 +1,16 @@
+require plm-firmware.inc
+
+FILESPATH .= ":${FILE_DIRNAME}/embeddedsw"
+
+SRC_URI += " \
+            file://makefile-skip-copy_bsp.sh.patch \
+            file://0001-versal_fw-Fixup-core-makefiles.patch \
+           "
+
+EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
+
+do_compile() {
+    oe_runmake
+
+    ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin
+}
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.1.bb
new file mode 100644
index 00000000..2c554d6d
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.1.bb
@@ -0,0 +1,16 @@
+require pmu-firmware.inc
+
+FILESPATH .= ":${FILE_DIRNAME}/embeddedsw"
+
+SRC_URI += " \
+            file://makefile-skip-copy_bsp.sh.patch \
+            file://0001-zynqmp_pmufw-Fixup-core-makefiles.patch \
+           "
+
+EXTRA_COMPILER_FLAGS = "-ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
+
+do_compile() {
+    oe_runmake
+
+    ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin
+}
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.1.bb
new file mode 100644
index 00000000..d861fb1c
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.1.bb
@@ -0,0 +1,16 @@
+require psm-firmware.inc
+
+FILESPATH .= ":${FILE_DIRNAME}/embeddedsw"
+
+SRC_URI += " \
+            file://makefile-skip-copy_bsp.sh.patch \
+            file://0001-versal_fw-Fixup-core-makefiles.patch \
+           "
+
+EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra"
+
+do_compile() {
+    oe_runmake
+
+    ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin
+}