9 files changed, 47 insertions, 42 deletions
diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2022.04.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2022.10.inc
index 0fad0367..9e5cfe5e 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-common_2022.04.inc
+++ b/recipes-bsp/u-boot/u-boot-fslc-common_2022.10.inc
@@ -1,19 +1,19 @@
-# Copyright (C) 2012-2019 O.S. Systems Software LTDA.
+# Copyright (C) 2012-2022 O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 inherit fsl-u-boot-localversion
 
 LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
 
 DEPENDS += "flex-native bison-native"
 
 SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https"
 
-SRCREV = "f88519827335b548fcd276acda32107f5120276f"
-SRCBRANCH = "2022.04+fslc"
+SRCREV = "cbd7eb17ac1f781b9c511982e43d52f4304f0fd5"
+SRCBRANCH = "2022.10+fslc"
 
-PV = "v2022.04+git${SRCPV}"
+PV = "2022.10+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.04.bb b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.10.bb
index 2e79166b..2e79166b 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.04.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2022.10.bb
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.04.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.10.bb
index 2660df9e..a7dfd8aa 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.04.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2022.10.bb
@@ -3,7 +3,7 @@ require u-boot-fslc-common_${PV}.inc
 DESCRIPTION = "U-boot bootloader mxsboot tool"
 SECTION = "bootloader"
 
-DEPENDS = "bison-native gnutls-native dtc openssl"
+DEPENDS = "swig-native bison-native gnutls-native dtc openssl"
 
 PROVIDES = "u-boot-mxsboot"
 
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2022.04.bb b/recipes-bsp/u-boot/u-boot-fslc_2022.10.bb
index de6d22d0..1953d788 100644
--- a/recipes-bsp/u-boot/u-boot-fslc_2022.04.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc_2022.10.bb
@@ -10,12 +10,6 @@ inherit ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '1', 'im
 
 DEPENDS += "bc-native dtc-native python3-setuptools-native"
 
-# Location known to imx-boot component, where U-Boot artifacts
-# should be additionally deployed.
-# See below note above do_deploy:append:mx8m-nxp-bsp for the purpose of
-# this delopyment location
-BOOT_TOOLS = "imx-boot-tools"
-
 PROVIDES += "u-boot"
 
 B = "${WORKDIR}/build"
diff --git a/recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc b/recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc
deleted file mode 100644
index 36f948c5..00000000
--- a/recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards."
-
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-SRCBRANCH = "lf_v2021.04"
-SRC_URI = "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}"
-SRCREV = "f7b43f8b4c1e4e3ee6c6ff2fe9c61b2092e8b96b"
-LOCALVERSION ?= "-imx_v2021.04_5.15.5-1.0.0"
-
-DEPENDS += "flex-native bison-native bc-native dtc-native"
-
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
-
-inherit fsl-u-boot-localversion
-
-BOOT_TOOLS = "imx-boot-tools"
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
new file mode 100644
index 00000000..939031d8
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-imx-common_2022.04.inc
@@ -0,0 +1,25 @@
+DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards."
+
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+SRC_URI = "git://github.com/nxp-imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}"
+SRCBRANCH = "lf_v2022.04"
+LOCALVERSION ?= "-imx_v2022.04_5.15.71-2.2.0"
+SRCREV = "181859317bfafef1da79c59a4498650168ad9df6"
+
+DEPENDS += " \
+    bc-native \
+    bison-native \
+    dtc-native \
+    flex-native \
+    gnutls-native \
+    xxd-native \
+"
+
+S = "${WORKDIR}/git"
+B = "${WORKDIR}/build"
+
+inherit fsl-u-boot-localversion
+
+BOOT_TOOLS = "imx-boot-tools"
diff --git a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.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_2021.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     = ""
diff --git a/recipes-bsp/u-boot/u-boot-imx_2021.04.bb b/recipes-bsp/u-boot/u-boot-imx_2022.04.bb
index 21883af8..d48395c3 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2021.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2022.04.bb
@@ -9,14 +9,17 @@ PROVIDES += "u-boot"
 
 inherit uuu_bootloader_tag
 
-UUU_BOOTLOADER            = ""
-UUU_BOOTLOADER:mx6-nxp-bsp        = "${UBOOT_BINARY}"
-UUU_BOOTLOADER:mx7-nxp-bsp        = "${UBOOT_BINARY}"
-UUU_BOOTLOADER_TAGGED     = ""
-UUU_BOOTLOADER_TAGGED:mx6-nxp-bsp = "u-boot-tagged.${UBOOT_SUFFIX}"
-UUU_BOOTLOADER_TAGGED:mx7-nxp-bsp = "u-boot-tagged.${UBOOT_SUFFIX}"
+UUU_BOOTLOADER                          = ""
+UUU_BOOTLOADER:mx6-generic-bsp          = "${UBOOT_BINARY}"
+UUU_BOOTLOADER:mx7-generic-bsp          = "${UBOOT_BINARY}"
+UUU_BOOTLOADER_TAGGED                   = ""
+UUU_BOOTLOADER_TAGGED:mx6-generic-bsp   = "u-boot-tagged.${UBOOT_SUFFIX}"
+UUU_BOOTLOADER_TAGGED:mx7-generic-bsp   = "u-boot-tagged.${UBOOT_SUFFIX}"
+UUU_BOOTLOADER_UNTAGGED                 = ""
+UUU_BOOTLOADER_UNTAGGED:mx6-generic-bsp = "u-boot-untagged.${UBOOT_SUFFIX}"
+UUU_BOOTLOADER_UNTAGGED:mx7-generic-bsp = "u-boot-untagged.${UBOOT_SUFFIX}"
 
-do_deploy:append:mx8m-nxp-bsp() {
+do_deploy:append:mx8m-generic-bsp() {
     # Deploy u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary
     if [ -n "${UBOOT_CONFIG}" ]
     then
@@ -27,8 +30,8 @@ do_deploy:append:mx8m-nxp-bsp() {
                 if [ $j -eq $i ]
                 then
                     install -d ${DEPLOYDIR}/${BOOT_TOOLS}
-                    install -m 0777 ${B}/${config}/arch/arm/dts/${UBOOT_DTB_NAME}  ${DEPLOYDIR}/${BOOT_TOOLS}
-                    install -m 0777 ${B}/${config}/u-boot-nodtb.bin  ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${type}
+                    install -m 0644 ${B}/${config}/arch/arm/dts/${UBOOT_DTB_NAME}  ${DEPLOYDIR}/${BOOT_TOOLS}
+                    install -m 0644 ${B}/${config}/u-boot-nodtb.bin  ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${type}
                 fi
             done
             unset  j
@@ -38,4 +41,4 @@ do_deploy:append:mx8m-nxp-bsp() {
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(mx6-generic-bsp|mx7-generic-bsp|mx8-generic-bsp)"
+COMPATIBLE_MACHINE = "(mx6-generic-bsp|mx7-generic-bsp|mx8-generic-bsp|mx9-generic-bsp)"
diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb b/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb
index b6385322..6c174210 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \
     file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
 "
 
-SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/u-boot;nobranch=1"
+SRC_URI = "git://github.com/nxp-qoriq/u-boot;protocol=https;nobranch=1"
 SRCREV= "1c0116f3da250c5a52858c53efb8b38c0963f477"
 
 S = "${WORKDIR}/git"