diff --git a/meta-lmp-base/recipes-bsp/u-boot/u-boot-fio-common.inc b/meta-lmp-base/recipes-bsp/u-boot/u-boot-fio-common.inc
index 2876014025..1cbda2c7ac 100644
--- a/meta-lmp-base/recipes-bsp/u-boot/u-boot-fio-common.inc
+++ b/meta-lmp-base/recipes-bsp/u-boot/u-boot-fio-common.inc
@@ -6,9 +6,11 @@ application code."
 SECTION = "bootloaders"
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
-DEPENDS += "flex-native bison-native bc-native dtc-native python3-setuptools-native"
+DEPENDS += "flex-native bison-native bc-native dtc-native python3-setuptools-native gnutls-native"
 
-SRC_URI = "git://github.com/foundriesio/u-boot.git;protocol=https;branch=${SRCBRANCH} \
+UBOOT_REPO ??= "git://github.com/foundriesio/u-boot.git"
+
+SRC_URI = "${UBOOT_REPO};protocol=https;branch=${SRCBRANCH} \
     file://fw_env.config \
     ${@bb.utils.contains('MACHINE_FEATURES', 'ebbr', 'file://lmp-ebbr.cfg', 'file://lmp.cfg', d)} \
 "
diff --git a/meta-lmp-base/recipes-bsp/u-boot/u-boot-fio-mfgtool_imx-2022.04.bb b/meta-lmp-base/recipes-bsp/u-boot/u-boot-fio-mfgtool_imx-2022.04.bb
new file mode 100644
index 0000000000..0868b247ea
--- /dev/null
+++ b/meta-lmp-base/recipes-bsp/u-boot/u-boot-fio-mfgtool_imx-2022.04.bb
@@ -0,0 +1,10 @@
+SUMMARY = "Produces a Manufacturing Tool compatible U-Boot"
+DESCRIPTION = "U-Boot recipe that produces a Manufacturing Tool compatible \
+binary to be used in updater environment"
+
+require recipes-bsp/u-boot/u-boot-fio_imx-2022.04.bb
+
+# Environment config is not required for mfgtool
+SRC_URI:remove = "file://fw_env.config"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/meta-lmp-base/recipes-bsp/u-boot/u-boot-fio_imx-2022.04.bb b/meta-lmp-base/recipes-bsp/u-boot/u-boot-fio_imx-2022.04.bb
new file mode 100644
index 0000000000..6f0b339b40
--- /dev/null
+++ b/meta-lmp-base/recipes-bsp/u-boot/u-boot-fio_imx-2022.04.bb
@@ -0,0 +1,5 @@
+require u-boot-fio-common.inc
+
+SRCREV = "edc7a363c9fcfa9b20c0dbbdf4d902fef595947b"
+SRCBRANCH = "2022.04+lf-5.15.32-2.0.0-fio"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"