From e2718679769de77a7be5216a66da7de79187b1d5 Mon Sep 17 00:00:00 2001 From: Florin Sarbu Date: Mon, 17 Jun 2024 20:44:07 +0000 Subject: [PATCH] nitrogen8mm-dwe.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 nitrogen8mm-dwe.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/nitrogen8mm-dwe.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/layers/meta-balena-fsl-arm/conf/machine/nitrogen8mm-dwe.conf b/layers/meta-balena-fsl-arm/conf/machine/nitrogen8mm-dwe.conf index 2980fb56..64045861 100644 --- a/layers/meta-balena-fsl-arm/conf/machine/nitrogen8mm-dwe.conf +++ b/layers/meta-balena-fsl-arm/conf/machine/nitrogen8mm-dwe.conf @@ -3,7 +3,7 @@ #@SOC: i.MX8 MQ #@DESCRIPTION: Machine configuration for Boundary Devices Nitrogen8MM DWE -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-dwe.dtb" -UBOOT_CONFIG[sd] = "dwe_1gch1_defconfig" +UBOOT_CONFIG = "dwe" +UBOOT_CONFIG[dwe] = "dwe_1gch1_defconfig,sdcard"