9 files changed, 11 insertions, 9 deletions

diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.17.inc b/recipes-bsp/firmware-imx/firmware-imx-8.18.inc
index 78f03c25..24829370 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8.17.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx-8.18.inc
@@ -9,8 +9,8 @@ SRC_URI = " \
     ${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \
 "
 
-SRC_URI[md5sum] = "63eac7b400d711c668458ec4bf5d0c60"
-SRC_URI[sha256sum] = "1ee3c49ad8749867487f09d6e4472536fb809b667c1bb3c56511175b8974e3c6"
+SRC_URI[md5sum] = "436501f8e67c10eed6bba88457e701a2"
+SRC_URI[sha256sum] = "f050f60351a54fd75954fdeb133ddd014a5576040c72616e216b63db0e242dd4"
 
 S = "${WORKDIR}/firmware-imx-${PV}"
 
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8_8.17.bb b/recipes-bsp/firmware-imx/firmware-imx-8_8.18.bb
index 18ce14d3..18ce14d3 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8_8.17.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx-8_8.18.bb
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8m_8.17.bb b/recipes-bsp/firmware-imx/firmware-imx-8m_8.18.bb
index 152ef0b5..152ef0b5 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8m_8.17.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx-8m_8.18.bb
diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.17.bb b/recipes-bsp/firmware-imx/firmware-imx_8.18.bb
index f84ea1fa..f84ea1fa 100644
--- a/recipes-bsp/firmware-imx/firmware-imx_8.17.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx_8.18.bb
diff --git a/recipes-bsp/imx-atf/imx-atf_2.6.bb b/recipes-bsp/imx-atf/imx-atf_2.6.bb
index 2e9bc089..f8c21e0b 100644
--- a/recipes-bsp/imx-atf/imx-atf_2.6.bb
+++ b/recipes-bsp/imx-atf/imx-atf_2.6.bb
@@ -13,7 +13,7 @@ SRC_URI = " \
 "
 
 SRCBRANCH = "lf_v2.6"
-SRCREV = "9202efc9aaf65085def9a747ee32aed628449901"
+SRCREV = "3c1583ba0a5d11e5116332e91065cb3740153a46"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb
index 6d7f1579..3bb1dcaf 100644
--- a/recipes-bsp/imx-lib/imx-lib_git.bb
+++ b/recipes-bsp/imx-lib/imx-lib_git.bb
@@ -13,7 +13,7 @@ PE = "1"
 PV = "5.9+${SRCPV}"
 
 SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "lf-5.15.52_2.1.0"
+SRCBRANCH = "lf-5.15.71_2.2.0"
 SRCREV = "87ddd80953835eb29027d1d5a12044a08e809e40"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
index 453ef0ed..4a4bc4c9 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
@@ -5,8 +5,8 @@ DEPENDS = "zlib-native openssl-native"
 SRC_URI = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \
            file://0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch \
 "
-SRCBRANCH = "lf-5.15.52_2.1.0"
-SRCREV = "37648c8ba5094420faa8206d8cb8e0c6f17d72fc"
+SRCBRANCH = "lf-5.15.71_2.2.0"
+SRCREV = "3bfcfccb71ddf894be9c402732ccb229fe72099e"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-bsp/u-boot/u-boot-imx-common_2022.04.inc b/recipes-bsp/u-boot/u-boot-imx-common_2022.04.inc
index 2925c2b8..939031d8 100644
--- a/recipes-bsp/u-boot/u-boot-imx-common_2022.04.inc
+++ b/recipes-bsp/u-boot/u-boot-imx-common_2022.04.inc
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a
 
 SRC_URI = "git://github.com/nxp-imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}"
 SRCBRANCH = "lf_v2022.04"
-LOCALVERSION ?= "-imx_v2022.04_5.15.52-2.1.0"
-SRCREV = "16e8414193985cf7a171f7b79e12ff30700157ba"
+LOCALVERSION ?= "-imx_v2022.04_5.15.71-2.2.0"
+SRCREV = "181859317bfafef1da79c59a4498650168ad9df6"
 
 DEPENDS += " \
     bc-native \
@@ -14,6 +14,7 @@ DEPENDS += " \
     dtc-native \
     flex-native \
     gnutls-native \
+    xxd-native \
 "
 
 S = "${WORKDIR}/git"
diff --git a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2022.04.bb b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2022.04.bb
index 500b2de0..d9d5b9d5 100644
--- a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2022.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2022.04.bb
@@ -2,9 +2,10 @@
 # Copyright (C) 2014-2016 Freescale Semiconductor
 # Copyright 2017-2019 NXP
 
+# Re-use the u-boot-imx recipe and its files
+require u-boot-imx_${PV}.bb
 FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-imx:"
 
-require u-boot-imx_${PV}.bb
 require u-boot-mfgtool.inc
 
 UUU_BOOTLOADER_TAGGED     = ""