summaryrefslogtreecommitdiffstats
path: root/conf/machine/include
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2022-07-23 11:39:47 -0300
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-07-29 21:20:34 +0000
commit2ede256f549af5f9e173b4a9139fd4af2524bea3 (patch)
tree6219532508bad30a7c0d971c32699305d562368b /conf/machine/include
parent10f4c0df3437696a3be3851cdc909b3d5dc94b41 (diff)
downloadmeta-freescale-2ede256f549af5f9e173b4a9139fd4af2524bea3.tar.gz
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 <otavio@ossystems.com.br> (cherry picked from commit bed09c8daec54c73766b563feb9ff7b4168c3e44)
Diffstat (limited to 'conf/machine/include')
-rw-r--r--conf/machine/include/imx-base.inc16
1 files changed, 6 insertions, 10 deletions
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 ?= " \
503 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \ 503 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \
504" 504"
505 505
506WKS_FILE_DEPENDS:append:mx8-nxp-bsp = " imx-boot"
507WKS_FILE_DEPENDS:append:mx8m-nxp-bsp = " imx-boot"
508
509# We need to restrict the append so we don't add this for other i.MX SoC's. 506# We need to restrict the append so we don't add this for other i.MX SoC's.
510# Derivatives that are not yet adopted the usage of boot container provided 507# Derivatives that are not yet adopted the usage of boot container provided
511# by U-Boot build are still targeted to use 'imx-boot' package provided by 508# by U-Boot build are still targeted to use 'imx-boot' package provided by
512# NXP. Moving those derivatives to mainline BSP would require to define an 509# NXP.
510#
511# Moving those derivatives to mainline BSP would require to define an
513# 'imx-boot-container' override, and test if the U-Boot built 'flash.bin' 512# 'imx-boot-container' override, and test if the U-Boot built 'flash.bin'
514# binary is used a replacement. 513# binary is used a replacement.
515# Note, that the results binary name of the boot container is set to 'imx-boot' 514#
515# NOTE: the results binary name of the boot container is set to 'imx-boot'
516# for both NXP and Mainline BSP. 516# for both NXP and Mainline BSP.
517# For Mainline BSP: the 'flash.bin' boot container is renamed during the 517WKS_FILE_DEPENDS:append:imx-generic-bsp:aarch64 = " \
518# deployment task extesion execution defined in imx-boot-container class.
519# For NXP BSP: rename is done in 'imx-boot' recipe at the execution of compile
520# task.
521WKS_FILE_DEPENDS:append:imx-mainline-bsp:aarch64 = " \
522 ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0', 'imx-boot', '')} \ 518 ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0', 'imx-boot', '')} \
523" 519"
524 520