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 --- 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 ------- 5 files changed, 3 insertions(+), 52 deletions(-) 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 (limited to 'recipes-kernel') 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_6.1.bb b/recipes-kernel/linux/linux-imx-mfgtool_6.1.bb deleted file mode 100644 index 26298fd9a..000000000 --- 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 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" -- cgit v1.2.3-54-g00ecf