From 6a1c8c27a981dc3f31c8ab5605eff053d7e87e59 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Mon, 28 Apr 2025 11:00:21 +0200 Subject: [PATCH] machine: ccimx8/9, ccmp1/2: configure default DTB in FIT image Configure the FIT_CONF_DEFAULT_DTB in the machine settings to define the default configuration for the generated FIT image. https://onedigi.atlassian.net/browse/DEL-9595 Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/ccimx8mm-dvk.conf | 1 + meta-digi-arm/conf/machine/ccimx8mn-dvk.conf | 1 + meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf | 1 + meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf | 1 + meta-digi-arm/conf/machine/ccimx91-dvk.conf | 1 + meta-digi-arm/conf/machine/ccimx93-dvk.conf | 1 + meta-digi-arm/conf/machine/ccmp13-dvk.conf | 1 + meta-digi-arm/conf/machine/ccmp15-dvk.conf | 1 + meta-digi-arm/conf/machine/ccmp25-dvk.conf | 1 + 9 files changed, 9 insertions(+) diff --git a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf index 394ead08c..ca47077fb 100644 --- a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf @@ -37,6 +37,7 @@ KERNEL_DEVICETREE ?= " \ digi/ccimx8m-dvk_user-leds.dtbo \ digi/ccimx8mm-dvk.dtb \ " +FIT_CONF_DEFAULT_DTB = "ccimx8mm-dvk.dtb" SERIAL_CONSOLES ?= "115200;ttymxc0" diff --git a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf index ac27c3197..ffcd958bc 100644 --- a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf @@ -38,6 +38,7 @@ KERNEL_DEVICETREE ?= " \ digi/ccimx8mn-dvk_v1-v2.dtbo \ digi/ccimx8mn-dvk.dtb \ " +FIT_CONF_DEFAULT_DTB = "ccimx8mn-dvk.dtb" SERIAL_CONSOLES ?= "115200;ttymxc0" diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf index 40a6a02f5..58a823e02 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf @@ -16,6 +16,7 @@ KERNEL_DEVICETREE ?= " \ digi/ccimx8x_wifi.dtbo \ digi/ccimx8x-sbc-express.dtb \ " +FIT_CONF_DEFAULT_DTB = "ccimx8x-sbc-express.dtb" SERIAL_CONSOLES ?= "115200;ttyLP2" diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf index 679d9ab0d..778992419 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf @@ -31,6 +31,7 @@ KERNEL_DEVICETREE ?= " \ digi/ccimx8x-sbc-pro_v1-v3.dtbo \ digi/ccimx8x-sbc-pro.dtb \ " +FIT_CONF_DEFAULT_DTB = "ccimx8x-sbc-pro.dtb" SERIAL_CONSOLES ?= "115200;ttyLP2" diff --git a/meta-digi-arm/conf/machine/ccimx91-dvk.conf b/meta-digi-arm/conf/machine/ccimx91-dvk.conf index aa78f0b22..1a7f6ed4e 100644 --- a/meta-digi-arm/conf/machine/ccimx91-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx91-dvk.conf @@ -32,6 +32,7 @@ KERNEL_DEVICETREE ?= " \ digi/ccimx9_wifi.dtbo \ ${@bb.utils.contains('DISTRO_FEATURES', 'tsn', 'digi/ccimx9-dvk_eqos-tsn.dtbo', '', d)} \ " +FIT_CONF_DEFAULT_DTB = "ccimx91-dvk.dtb" # Default image for install scripts DEFAULT_IMAGE_NAME ?= "core-image-base" diff --git a/meta-digi-arm/conf/machine/ccimx93-dvk.conf b/meta-digi-arm/conf/machine/ccimx93-dvk.conf index 1f64f7144..b30ccfc2d 100644 --- a/meta-digi-arm/conf/machine/ccimx93-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx93-dvk.conf @@ -35,6 +35,7 @@ KERNEL_DEVICETREE ?= " \ digi/ccimx93-dvk.dtb \ ${@bb.utils.contains('DISTRO_FEATURES', 'tsn', 'digi/ccimx9-dvk_eqos-tsn.dtbo', '', d)} \ " +FIT_CONF_DEFAULT_DTB = "ccimx93-dvk.dtb" # Add additional firmware MACHINE_FIRMWARE:append = " ethos-u-firmware" diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf index e6f114fec..a75aece69 100644 --- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf @@ -45,6 +45,7 @@ STM32MP_KERNEL_DEVICETREE:ccmp13-dvk += " \ ccmp13-dvk_v2.dtbo \ ccmp133-dvk.dtb \ " +FIT_CONF_DEFAULT_DTB = "ccmp133-dvk.dtb" # Set DTB load address to U-Boot fdt_addr_r UBOOT_DTB_LOADADDRESS = "0xc4000000" # List of U-Boot device tree to use diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf index 10f8fd799..daf3a748b 100644 --- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf @@ -55,6 +55,7 @@ STM32MP_KERNEL_DEVICETREE:ccmp15-dvk += " \ ccmp15-dvk_v2.dtbo \ ccmp157-dvk.dtb \ " +FIT_CONF_DEFAULT_DTB = "ccmp157-dvk.dtb" # Set DTB load address to U-Boot fdt_addr_r UBOOT_DTB_LOADADDRESS = "0xc4000000" # List of U-Boot device tree to use diff --git a/meta-digi-arm/conf/machine/ccmp25-dvk.conf b/meta-digi-arm/conf/machine/ccmp25-dvk.conf index 728e5f9e8..b58f73999 100644 --- a/meta-digi-arm/conf/machine/ccmp25-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp25-dvk.conf @@ -59,6 +59,7 @@ STM32MP_KERNEL_DEVICETREE:ccmp25-dvk += " \ ccmp25-dvk_nhd-3-5-640480ef-msxp-mipi-dsi.dtbo \ ccmp25-dvk_usb-3-0-typec.dtbo \ " +FIT_CONF_DEFAULT_DTB = "ccmp25-dvk.dtb" # ========================================================================= # optee