Move from 2021.2 to 2022.1

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
(cherry picked from commit eef9f49887e2471768b649450a0769859fd63ba5)
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

18 files changed, 5 insertions, 2 deletions

diff --git a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2021.2.bb b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb
index f69ed50c..f69ed50c 100644
--- a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2021.2.bb
+++ b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb
diff --git a/meta-xilinx-bsp/recipes-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/recipes-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-bsp/recipes-bsp/u-boot/u-boot-xlnx_2021.2.bb b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2022.1.bb
index a4fedbe2..a4fedbe2 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2021.2.bb
+++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2022.1.bb
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2021.2.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2022.1.bb
index 98785e7e..98785e7e 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2021.2.bb
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2022.1.bb
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native_2021.2.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb
index f657186f..f657186f 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native_2021.2.bb
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native_2022.1.bb
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-system-native_2021.2.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.bb
index b30777d2..b30777d2 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-system-native_2021.2.bb
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-system-native_2022.1.bb
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2021.2.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2022.1.bb
index 5189595a..5189595a 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2021.2.bb
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2022.1.bb
diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2021.2.bb b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2022.1.bb
index 660f6037..660f6037 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2021.2.bb
+++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2022.1.bb
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-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
index 15ddd0ae..4ae4c2f8 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] = "master-next"
+ESW_BRANCH[git]    = "master-next"
 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] = "9a8636219aa90eec16b7ad7ae072ca19198d389c"
+ESW_REV[git]    = "9a8636219aa90eec16b7ad7ae072ca19198d389c"
 SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}"
 
 EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}"
@@ -32,6 +34,7 @@ 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[master-next]       = '593ba3fb8be51271097ddaa4b9c65cde'
 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/recipes-bsp/embeddedsw/fsbl-firmware_2021.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.1.bb
index 3f9740a0..3f9740a0 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2021.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.1.bb
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2021.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.1.bb
index cc810241..cc810241 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2021.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.1.bb
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2021.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.1.bb
index 2c554d6d..2c554d6d 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2021.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.1.bb
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2021.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.1.bb
index d861fb1c..d861fb1c 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2021.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.1.bb