From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 14 Apr 2020 21:50:32 +0000 (-0300)
Subject: imx-base.inc: Postpone the expanion of BSP choice
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=7541e303085b2e6bb50ab13d66d18cb143777c5b;p=meta-freescale.git

imx-base.inc: Postpone the expanion of BSP choice

We need to postpone the expanion so we avoid cycles.

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

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index feb243b9..eb886de6 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -15,12 +15,15 @@ IMX_DEFAULT_BOOTLOADER_mx8 = "u-boot-imx"
 #
 # Two values are considered valid: mainline, nxp
 IMX_DEFAULT_BSP ??= "mainline"
-MACHINEOVERRIDES .= ":use-${IMX_DEFAULT_BSP}-bsp"
 
 # Those are SoC families we'd like to force the use of mainline BSP.
 IMX_DEFAULT_BSP_mxs = "mainline"
 IMX_DEFAULT_BSP_mx5 = "mainline"
 
+# the MACHINEOVERRIDES. This is required so this is reworked late in the
+# expansion cycle.
+DISTROOVERRIDES_append = ":use-${IMX_DEFAULT_BSP}-bsp"
+
 PREFERRED_PROVIDER_u-boot ??= "${IMX_DEFAULT_BOOTLOADER}"
 PREFERRED_PROVIDER_u-boot-tools-native ??= "${IMX_DEFAULT_BOOTLOADER}-tools-native"
 PREFERRED_PROVIDER_nativesdk-u-boot-tools ??= "nativesdk-${IMX_DEFAULT_BOOTLOADER}-tools"