From daafef6972925793bf4f5c513cf039ec1cd37226 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 13 Sep 2023 14:21:29 +0200 Subject: [PATCH] ccimx93-dvk: fix machine overrides order ARM64 generic overrides were in the middle of the chain with more precedence than IMX overrides. From: MACHINEOVERRIDES="imx-generic-bsp:imx-nxp-bsp:imxdrm:imxpxp:mx9-generic-bsp:mx9-nxp-bsp:mx93-generic-bsp:mx93-nxp-bsp:ccimx93:ccimx93:aarch64:armv8-2a:use-nxp-bsp:ccimx93-dvk" To: MACHINEOVERRIDES="aarch64:armv8-2a:use-nxp-bsp:imx-generic-bsp:imx-nxp-bsp:imxdrm:imxpxp:mx9-generic-bsp:mx9-nxp-bsp:mx93-generic-bsp:mx93-nxp-bsp:ccimx93:ccimx93:ccimx93-dvk" Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/ccimx93-dvk.conf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccimx93-dvk.conf b/meta-digi-arm/conf/machine/ccimx93-dvk.conf index e8201cea0..30f5ba12c 100644 --- a/meta-digi-arm/conf/machine/ccimx93-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx93-dvk.conf @@ -3,12 +3,10 @@ #@DESCRIPTION: Machine configuration for Digi's ConnectCore 93 DVK DIGI_SOM = "ccimx93" +MACHINEOVERRIDES =. "mx93:${DIGI_FAMILY}:${DIGI_SOM}:" require include/ccimx93.inc -MACHINEOVERRIDES =. "${DIGI_FAMILY}:${DIGI_SOM}:" -MACHINEOVERRIDES =. "mx93:" - # U-Boot configurations UBOOT_CONFIG ??= "ccimx93-dvk" UBOOT_CONFIG[ccimx93-dvk] = "ccimx93-dvk_defconfig" @@ -62,4 +60,4 @@ BOOTABLE_ARTIFACTS = "imx-boot-ccimx93-dvk.bin" # Default overlayfs_etc mount point and type OVERLAYFS_ETC_MOUNT_POINT ?= "/mnt/data" OVERLAYFS_ETC_DEVICE ?= "/dev/mmcblk0p7" -OVERLAYFS_ETC_FSTYPE ?= "ext4" \ No newline at end of file +OVERLAYFS_ETC_FSTYPE ?= "ext4"