From 88399694f0d4bd8da30b562ba69a6e9d76d5046c Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 11 Feb 2023 17:32:16 -0300 Subject: linux-*-mfgtool, u-boot-*-mfgtool: Remove specific recipes The use of a specific recipes are not need anymore. For the U-Boot specific case, the UBOOT_CONFIG mechanism allows multiple binaries using different configurations so we can remove this recipes and default to the IMX_DEFAULT_BOOTLOADER as provider. The Linux specific case is completely unnecessary as the USB gadget is supported in all versions we support. Signed-off-by: Otavio Salvador --- conf/machine/include/imx-base.inc | 4 +--- recipes-bsp/u-boot/u-boot-fslc-mfgtool_2023.01.bb | 8 -------- recipes-bsp/u-boot/u-boot-fslc_2023.01.bb | 2 +- recipes-bsp/u-boot/u-boot-imx-mfgtool_2022.04.bb | 13 ------------- recipes-bsp/u-boot/u-boot-imx_2022.04.bb | 2 +- recipes-bsp/u-boot/u-boot-mfgtool.inc | 21 --------------------- recipes-kernel/linux/linux-fslc-lts-mfgtool_5.15.bb | 15 --------------- recipes-kernel/linux/linux-fslc-mfgtool_6.1.bb | 15 --------------- recipes-kernel/linux/linux-imx-mfgtool_6.1.bb | 15 --------------- recipes-kernel/linux/linux-imx.inc | 3 +++ recipes-kernel/linux/linux-mfgtool.inc | 7 ------- 11 files changed, 6 insertions(+), 99 deletions(-) delete mode 100644 recipes-bsp/u-boot/u-boot-fslc-mfgtool_2023.01.bb delete mode 100644 recipes-bsp/u-boot/u-boot-imx-mfgtool_2022.04.bb delete mode 100644 recipes-bsp/u-boot/u-boot-mfgtool.inc delete mode 100644 recipes-kernel/linux/linux-fslc-lts-mfgtool_5.15.bb delete mode 100644 recipes-kernel/linux/linux-fslc-mfgtool_6.1.bb delete mode 100644 recipes-kernel/linux/linux-imx-mfgtool_6.1.bb delete mode 100644 recipes-kernel/linux/linux-mfgtool.inc diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 7ff2741d..0959dfe3 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 2e79166b..00000000 --- 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 f6164a76..eba8876a 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 d9d5b9d5..00000000 --- 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 c8119fdb..e76c29c6 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 92d055bf..00000000 --- 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 95dd72fb..00000000 --- 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 09d35c91..00000000 --- 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_6.1.bb b/recipes-kernel/linux/linux-imx-mfgtool_6.1.bb deleted file mode 100644 index 26298fd9..00000000 --- a/recipes-kernel/linux/linux-imx-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 -# Copyright (C) 2017-2023 NXP - -SUMMARY = "Produces a Manufacturing Tool compatible Linux Kernel" -DESCRIPTION = "Linux Kernel provided and supported by NXP 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 b386e058..1a37bf20 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 93a27d8c..00000000 --- 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" -- cgit v1.2.3-54-g00ecf