Merge remote-tracking branch 'origin/rel-v2022.2' into honister

6 files changed, 65 insertions, 3 deletions

diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
index b3fde2d4..7ae40871 100644
--- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
+++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
@@ -10,6 +10,7 @@ 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[2022.1] = "xlnx_rel_v2022.1_update"
+ESW_BRANCH[2022.2] = "xlnx_rel_v2022.2-next"
 ESW_BRANCH[git]    = "master-next"
 BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}"
 
@@ -20,6 +21,7 @@ ESW_REV[2020.2] = "2516d5ed8161e16c2813b0e8e4ceac693f23de5c"
 ESW_REV[2021.1] = "d37a0e8824182597abf31ac3f1087a5321b33ad7"
 ESW_REV[2021.2] = "49c6694fc3cab6b87dd564da58a83bb8656a7c03"
 ESW_REV[2022.1] = "0cfb554e841f0837cabbb40a2481f5f7e5f2ddc0"
+ESW_REV[2022.2] = "f9503dcf194083da984776e51dc9c07f8cb6d498"
 ESW_REV[git]    = "7ec60e1c0e25bfa9c5e8c77d6d063876f6670770"
 SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}"
 
@@ -35,8 +37,9 @@ LIC_FILES_CHKSUM[xlnx_rel_v2021.1]  = "73e8997d53c2137fdeea4331a73f40fa"
 LIC_FILES_CHKSUM[xlnx_rel_v2021.2]  = 'ba23909a4bcaf754a2e1ba996f1ca1b0'
 LIC_FILES_CHKSUM[xlnx_rel_v2022.1]  = 'e62cb7a722c4430999e0a55a7234035d'
 LIC_FILES_CHKSUM[xlnx_rel_v2022.1_update] = 'e62cb7a722c4430999e0a55a7234035d'
-LIC_FILES_CHKSUM[master-next]       = '87cee16dbcd2c2f7ceef30163838056e'
-LIC_FILES_CHKSUM[master]            = '593ba3fb8be51271097ddaa4b9c65cde'
+LIC_FILES_CHKSUM[xlnx_rel_v2022.2-next] = '7b5fc0b2a22e2882e1506436b3293e5d'
+LIC_FILES_CHKSUM[master-next]       = '7b5fc0b2a22e2882e1506436b3293e5d'
+LIC_FILES_CHKSUM[master]            = '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 f7ebaca4..79997d24 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 = "v2022.1"
+XILINX_RELEASE_VERSION = "v2022.2"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.2.bb
new file mode 100644
index 00000000..3f9740a0
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2022.2.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.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.2.bb
new file mode 100644
index 00000000..cc810241
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2022.2.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.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.2.bb
new file mode 100644
index 00000000..2c554d6d
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2022.2.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.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.2.bb
new file mode 100644
index 00000000..d861fb1c
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2022.2.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
+}