From 2c312439350249a947dcd037c44509f6738e9636 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 12 Apr 2023 12:58:15 -0300 Subject: imx-base.inc: fix typo in a comment Signed-off-by: Otavio Salvador --- conf/machine/include/imx-base.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 4efaaa97..fabf6d38 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -586,7 +586,7 @@ WKS_FILE_DEPENDS ?= " \ # # Moving those derivatives to mainline BSP would require to set # UBOOT_PROVIDES_BOOT_CONTAINER to "1" and test if the U-Boot built 'flash.bin' -# binary is a workingreplacement. +# binary is a working replacement. # # NOTE: the results binary name of the boot container is set to 'imx-boot' # for both NXP and Mainline BSP. -- cgit v1.2.3-54-g00ecf From 4beaafe643f414da6aff91dd2659bc9c1eefe87f Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 12 Apr 2023 13:08:09 -0300 Subject: imx-base.inc: dynamically choose if boot container should be used The boot container should be used only if we're not using u-boot-imx as IMX_DEFAULT_BOOTLOADER. Signed-off-by: Otavio Salvador --- conf/machine/include/imx-base.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index fabf6d38..37e67dea 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -102,7 +102,10 @@ UBOOT_ENTRYPOINT:vf-generic-bsp ?= "0x80008000" # below variable sets that those SoC do use this rather than # assembling it in the imx-boot recipe. UBOOT_PROVIDES_BOOT_CONTAINER = "0" -UBOOT_PROVIDES_BOOT_CONTAINER:mx8m-generic-bsp = "1" + +# The boot container should be used only if we're not using u-boot-imx as +# IMX_DEFAULT_BOOTLOADER. +UBOOT_PROVIDES_BOOT_CONTAINER:mx8m-generic-bsp = "${@oe.utils.ifelse(d.getVar('IMX_DEFAULT_BOOTLOADER') == 'u-boot-imx', '0', '1')}" # Trusted Firmware for Cortex-A (TF-A) can have different providers, either # from upstream or from NXP downstream fork. Below variable defines which TF-A -- cgit v1.2.3-54-g00ecf