From bed09c8daec54c73766b563feb9ff7b4168c3e44 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 23 Jul 2022 11:39:47 -0300 Subject: imx-base.inc: avoid explicit imx-boot dependency We shouldn't force `imx-boot` dependency for i.MX8 SoCs as many can use U-Boot mainline and those use `imx-boot-container` to generate the binary blob. We moved the backward-compatibility note, about 'imx-boot' to the 'imx-boot-container' class. Signed-off-by: Otavio Salvador --- conf/machine/include/imx-base.inc | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'conf/machine/include') diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index e24e14e1..43e78282 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -503,22 +503,18 @@ WKS_FILE_DEPENDS ?= " \ ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \ " -WKS_FILE_DEPENDS:append:mx8-nxp-bsp = " imx-boot" -WKS_FILE_DEPENDS:append:mx8m-nxp-bsp = " imx-boot" - # We need to restrict the append so we don't add this for other i.MX SoC's. # Derivatives that are not yet adopted the usage of boot container provided # by U-Boot build are still targeted to use 'imx-boot' package provided by -# NXP. Moving those derivatives to mainline BSP would require to define an +# NXP. +# +# Moving those derivatives to mainline BSP would require to define an # 'imx-boot-container' override, and test if the U-Boot built 'flash.bin' # binary is used a replacement. -# Note, that the results binary name of the boot container is set to 'imx-boot' +# +# NOTE: the results binary name of the boot container is set to 'imx-boot' # for both NXP and Mainline BSP. -# For Mainline BSP: the 'flash.bin' boot container is renamed during the -# deployment task extesion execution defined in imx-boot-container class. -# For NXP BSP: rename is done in 'imx-boot' recipe at the execution of compile -# task. -WKS_FILE_DEPENDS:append:imx-mainline-bsp:aarch64 = " \ +WKS_FILE_DEPENDS:append:imx-generic-bsp:aarch64 = " \ ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0', 'imx-boot', '')} \ " -- cgit v1.2.3-54-g00ecf