imx-base.inc: dynamically choose if boot container should be usedfix-boot-container

The boot container should be used only if we're not using u-boot-imx as
IMX_DEFAULT_BOOTLOADER.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

1 files changed, 4 insertions, 1 deletions

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