From eb3ec053fc959319a7aa39bb7e9c489607dfc517 Mon Sep 17 00:00:00 2001 From: Florin Sarbu Date: Fri, 14 Jun 2024 08:22:17 +0000 Subject: [PATCH] emgw3.conf: Fix u-boot config and use append style for MACHINEOVERRIDES With the switch to kirkstone, the upstream BSP changed the u-boot config used by the machine we include in emgw3.conf Also let's use an append style for MACHINEOVERRIDES which makes it clearer Signed-off-by: Florin Sarbu --- layers/meta-balena-fsl-arm/conf/machine/emgw3.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/layers/meta-balena-fsl-arm/conf/machine/emgw3.conf b/layers/meta-balena-fsl-arm/conf/machine/emgw3.conf index 7a9e0de7..fbcb3c2e 100644 --- a/layers/meta-balena-fsl-arm/conf/machine/emgw3.conf +++ b/layers/meta-balena-fsl-arm/conf/machine/emgw3.conf @@ -3,7 +3,7 @@ #@SOC: i.MX8 MM #@DESCRIPTION: Machine configuration for Boundary EM GW 3 -MACHINEOVERRIDES = "nitrogen8mm:${MACHINE}" +MACHINEOVERRIDES =. "nitrogen8mm:" include conf/machine/nitrogen8mm.conf @@ -14,4 +14,5 @@ KERNEL_DEVICETREE = " \ # Override default Nitrogen8MM u-boot configuration UBOOT_DTB_NAME = "imx8mm-em.dtb" -UBOOT_CONFIG[sd] = "em_2gr0_defconfig" +UBOOT_CONFIG = "emgw3" +UBOOT_CONFIG[emgw3] = "em_2gr0_defconfig,sdcard"