From 5598c5973d430eb0fa64683a04238600ed47e614 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Thu, 13 Mar 2025 22:36:41 +0100 Subject: [PATCH] ccmp25-dvk: Force main DTB as the first item in the kernel device tree list for FIT images The kernel-fitimage class sets the default configuration using the first element from the kernel device tree list. This commit ensures that the main DTB is listed first to enforce the correct default configuration. https://onedigi.atlassian.net/browse/DEL-9442 Signed-off-by: Arturo Buzarra --- meta-digi-arm/conf/machine/ccmp25-dvk.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccmp25-dvk.conf b/meta-digi-arm/conf/machine/ccmp25-dvk.conf index e52935aed..be3b34b90 100644 --- a/meta-digi-arm/conf/machine/ccmp25-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp25-dvk.conf @@ -42,8 +42,10 @@ STM32MP_DT_FILES_EMMC = "ccmp25-dvk" STM32MP_DT_FILES_SDCARD = "${STM32MP_DT_FILES_EMMC}" STM32MP_DT_FILES_USB = "${STM32MP_DT_FILES_EMMC}" -# Extra DTB for board - need to specify it with .dtb ... +# Extra files for the board must be specified while ensuring the main DTB +# file for FIT image generation remains the first item. STM32MP_KERNEL_DEVICETREE:ccmp25-dvk += " \ + ccmp25-dvk.dtb \ ccmp25_bt.dtbo \ ccmp25_wifi.dtbo \ ccmp25-dvk_e55rb-i-mw346-c-mipi-dsi.dtbo \ @@ -56,7 +58,6 @@ STM32MP_KERNEL_DEVICETREE:ccmp25-dvk += " \ ccmp25-dvk_n25q256a-spi-nor-flash.dtbo \ ccmp25-dvk_nhd-3-5-640480ef-msxp-mipi-dsi.dtbo \ ccmp25-dvk_usb-3-0-typec.dtbo \ - ccmp25-dvk.dtb \ " # =========================================================================