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-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 --------------------- 5 files changed, 2 insertions(+), 44 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 (limited to 'recipes-bsp') 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 c8119fdb9..e76c29c61 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}" -- cgit v1.2.3-54-g00ecf