From 634be0dc7e168e89df9043fd260b6897361e9006 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 19 Mar 2021 14:58:41 -0300 Subject: imx-base.inc: Allow override of IMX_DEFAULT_BOOTLOADER We need to allow the override of the variable in 'local.conf' or other places, so we cannot overwrite it inside imx-base.inc. Signed-off-by: Otavio Salvador --- conf/machine/include/imx-base.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 6c9f3aa6..4790005b 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -18,8 +18,8 @@ IMX_DEFAULT_BSP_mx5 ?= "mainline" MACHINEOVERRIDES =. "use-${IMX_DEFAULT_BSP}-bsp:" -IMX_DEFAULT_BOOTLOADER = "u-boot-fslc" -IMX_DEFAULT_BOOTLOADER_mx8 = "u-boot-imx" +IMX_DEFAULT_BOOTLOADER ??= "u-boot-fslc" + IMX_DEFAULT_UBOOTTOOLS = "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx','u-boot-imx-tools', 'u-boot-tools', d)}" PREFERRED_PROVIDER_u-boot ??= "${IMX_DEFAULT_BOOTLOADER}" -- cgit v1.2.3-54-g00ecf