11 files changed, 6 insertions, 98 deletions

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index a3fe90181..cddf54be3 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -75,10 +75,8 @@ UBOOT_SUFFIX ?= "${UBOOT_SUFFIX:pn-${IMX_DEFAULT_BOOTLOADER}}"
 # wic based images.
 SPL_BINARY ??= "${@get_spl_binary(d)}"
 
-IMX_DEFAULT_MFGTOOL = "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx','u-boot-imx-mfgtool', 'u-boot-fslc', d)}"
-
 PREFERRED_PROVIDER_u-boot ??= "${IMX_DEFAULT_BOOTLOADER}"
-PREFERRED_PROVIDER_u-boot-mfgtool ??= "${IMX_DEFAULT_MFGTOOL}"
+PREFERRED_PROVIDER_u-boot-mfgtool ??= "${IMX_DEFAULT_BOOTLOADER}"
 PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}"
 
 PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2023.01.bb b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2023.01.bb
deleted file mode 100644
index 2e79166b2..000000000
--- a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2023.01.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (C) 2014 O.S. Systems Software LTDA.
-# Copyright (C) 2014-2016 Freescale Semiconductor
-# Copyright 2017-2019 NXP
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-fslc:"
-
-require u-boot-fslc_${PV}.bb
-require u-boot-mfgtool.inc
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2023.01.bb b/recipes-bsp/u-boot/u-boot-fslc_2023.01.bb
index f6164a768..eba8876aa 100644
--- a/recipes-bsp/u-boot/u-boot-fslc_2023.01.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc_2023.01.bb
@@ -10,7 +10,7 @@ inherit ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '1', 'im
 
 DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native"
 
-PROVIDES += "u-boot"
+PROVIDES += "u-boot u-boot-mfgtool"
 
 B = "${WORKDIR}/build"
 
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
deleted file mode 100644
index d9d5b9d59..000000000
--- a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2022.04.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (C) 2014 O.S. Systems Software LTDA.
-# 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-mfgtool.inc
-
-UUU_BOOTLOADER_TAGGED     = ""
-UUU_BOOTLOADER_TAGGED:mx6-nxp-bsp = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}"
-UUU_BOOTLOADER_TAGGED:mx7-nxp-bsp = "u-boot-mfgtool-tagged.${UBOOT_SUFFIX}"
diff --git a/recipes-bsp/u-boot/u-boot-imx_2022.04.bb b/recipes-bsp/u-boot/u-boot-imx_2022.04.bb
index c1ddf12f7..9ec7078c4 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2022.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2022.04.bb
@@ -5,7 +5,7 @@
 require recipes-bsp/u-boot/u-boot.inc
 require u-boot-imx-common_${PV}.inc
 
-PROVIDES += "u-boot"
+PROVIDES += "u-boot u-boot-mfgtool"
 
 inherit uuu_bootloader_tag
 
diff --git a/recipes-bsp/u-boot/u-boot-mfgtool.inc b/recipes-bsp/u-boot/u-boot-mfgtool.inc
deleted file mode 100644
index 92d055bfb..000000000
--- a/recipes-bsp/u-boot/u-boot-mfgtool.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-# Produces a Manufacturing Tool compatible U-Boot
-#
-# This makes a separated binary set for Manufacturing Tool use
-# without clobbering the U-Boot used for normal use.
-#
-# This file must to be included after the original u-boot.inc file,
-# as it overrides the need values.
-#
-# Copyright (C) 2014 O.S. Systems Software LTDA.
-
-# Adjust provides
-PROVIDES = "u-boot-mfgtool"
-
-# Use 'mfgtool' config
-UBOOT_CONFIG = "mfgtool"
-
-# Add 'mfgtool' suffix
-UBOOT_IMAGE = "u-boot-${MACHINE}-mfgtool-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "u-boot-${MACHINE}-mfgtool.${UBOOT_SUFFIX}"
-SPL_IMAGE = "${SPL_BINARYNAME}-${MACHINE}-mfgtool-${PV}-${PR}"
-SPL_SYMLINK = "${SPL_BINARYNAME}-mfgtool-${MACHINE}"
diff --git a/recipes-kernel/linux/linux-fslc-lts-mfgtool_5.15.bb b/recipes-kernel/linux/linux-fslc-lts-mfgtool_5.15.bb
deleted file mode 100644
index 95dd72fb8..000000000
--- a/recipes-kernel/linux/linux-fslc-lts-mfgtool_5.15.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (C) 2014-2018 O.S. Systems Software LTDA.
-# Copyright (C) 2014-2016 Freescale Semiconductor
-
-SUMMARY = "Produces a Manufacturing Tool compatible Linux Kernel"
-DESCRIPTION = "Linux Kernel provided and supported by the Freescale Community \
-that produces a Manufacturing Tool compatible Linux Kernel to be used in updater \
-environment"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/linux-fslc:"
-require linux-fslc-lts_${PV}.bb
-require linux-mfgtool.inc
-
-KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
-MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
-do_package[vardepsexclude] = "DATETIME"
diff --git a/recipes-kernel/linux/linux-fslc-mfgtool_6.1.bb b/recipes-kernel/linux/linux-fslc-mfgtool_6.1.bb
deleted file mode 100644
index 09d35c915..000000000
--- a/recipes-kernel/linux/linux-fslc-mfgtool_6.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (C) 2014-2018 O.S. Systems Software LTDA.
-# Copyright (C) 2014-2016 Freescale Semiconductor
-
-SUMMARY = "Produces a Manufacturing Tool compatible Linux Kernel"
-DESCRIPTION = "Linux Kernel provided and supported by the Freescale Community \
-that produces a Manufacturing Tool compatible Linux Kernel to be used in updater \
-environment"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/linux-fslc:"
-require linux-fslc_${PV}.bb
-require linux-mfgtool.inc
-
-KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
-MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
-do_package[vardepsexclude] = "DATETIME"
diff --git a/recipes-kernel/linux/linux-imx-mfgtool_5.15.bb b/recipes-kernel/linux/linux-imx-mfgtool_5.15.bb
deleted file mode 100644
index 311245b19..000000000
--- a/recipes-kernel/linux/linux-imx-mfgtool_5.15.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (C) 2014-2018 O.S. Systems Software LTDA.
-# Copyright (C) 2014-2016 Freescale Semiconductor
-
-SUMMARY = "Produces a Manufacturing Tool compatible Linux Kernel"
-DESCRIPTION = "Linux Kernel provided and supported by Freescale that produces a \
-Manufacturing Tool compatible Linux Kernel to be used in updater environment"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/linux-imx:"
-require linux-imx_${PV}.bb
-require linux-mfgtool.inc
-
-KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
-MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
-do_package[vardepsexclude] = "DATETIME"
diff --git a/recipes-kernel/linux/linux-imx.inc b/recipes-kernel/linux/linux-imx.inc
index b386e058b..1a37bf20f 100644
--- a/recipes-kernel/linux/linux-imx.inc
+++ b/recipes-kernel/linux/linux-imx.inc
@@ -11,6 +11,9 @@ LOCALVERSION ?= ""
 SCMVERSION ?= "y"
 SRCBRANCH ?= ""
 
+# Allow use of kernel as linux-mfgtool provider.
+PROVIDES += "linux-mfgtool"
+
 # Set the PV to the correct kernel version to satisfy the kernel version sanity check
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/recipes-kernel/linux/linux-mfgtool.inc b/recipes-kernel/linux/linux-mfgtool.inc
deleted file mode 100644
index 93a27d8c6..000000000
--- a/recipes-kernel/linux/linux-mfgtool.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-# Produces a Manufacturing Tool compatible Linux Kernel
-#
-# Copyright (C) 2014, 2015, 2018 O.S. Systems Software LTDA.
-
-PROVIDES = "linux-mfgtool"
-
-KERNEL_PACKAGE_NAME = "linux-mfgtool"