From cd56a8ebf7abae3bd31c4bf3ec77e10553fefe13 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Fri, 26 Sep 2025 15:13:27 +0200
Subject: [PATCH] meta-digi-arm: clean up ccimx9 DDR firmware handling

Move the LPDDR4 firmware list from the shared ccimx9 include into the
machine configurations for the ccimx91/93 DVK, allowing the upcoming
ccimx95 to utilize its own distinct values.

Also, remove the redundant IMXBOOT_TARGETS and BOOTLOADER_SEEK_USERDATA
overrides in ccimx91-dvk, as they are duplicated.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta-digi-arm/conf/machine/ccimx91-dvk.conf   | 9 ++++++---
 meta-digi-arm/conf/machine/ccimx93-dvk.conf   | 7 +++++++
 meta-digi-arm/conf/machine/include/ccimx9.inc | 7 -------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/meta-digi-arm/conf/machine/ccimx91-dvk.conf b/meta-digi-arm/conf/machine/ccimx91-dvk.conf
index f0c0ba895..fd3250f71 100644
--- a/meta-digi-arm/conf/machine/ccimx91-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx91-dvk.conf
@@ -8,8 +8,6 @@ MACHINEOVERRIDES =. "mx91:${DIGI_FAMILY}:${DIGI_SOM}:"
 # Include the machine configuration for Digi's ConnectCore 9 module
 include conf/machine/include/ccimx9.inc
 
-IMXBOOT_TARGETS = "flash_singleboot"
-
 # U-Boot configurations
 UBOOT_CONFIG ??= "ccimx91-dvk"
 UBOOT_CONFIG[ccimx91-dvk] = "ccimx91-dvk_defconfig"
@@ -25,7 +23,12 @@ IMX_BOOT_SOC_TARGET = "iMX91"
 IMXBOOT_TARGETS = "flash_singleboot"
 SECO_FIRMWARE_NAME:ccimx91 = "mx91a0-ahab-container.img"
 
-BOOTLOADER_SEEK_USERDATA = "32"
+DDR_FIRMWARE_NAME = " \
+    lpddr4_dmem_1d_v202201.bin \
+    lpddr4_dmem_2d_v202201.bin \
+    lpddr4_imem_1d_v202201.bin \
+    lpddr4_imem_2d_v202201.bin \
+"
 
 KERNEL_DEVICETREE ?= " \
     digi/ccimx91-dvk.dtb \
diff --git a/meta-digi-arm/conf/machine/ccimx93-dvk.conf b/meta-digi-arm/conf/machine/ccimx93-dvk.conf
index 03de79998..e13bca6f1 100644
--- a/meta-digi-arm/conf/machine/ccimx93-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx93-dvk.conf
@@ -25,6 +25,13 @@ IMXBOOT_TARGETS = "flash_singleboot flash_singleboot_a0"
 # one in "use-imx-security-controller-firmware.bbclass" takes precedence)
 SECO_FIRMWARE_NAME:ccimx93 = "mx93??-ahab-container.img"
 
+DDR_FIRMWARE_NAME = " \
+    lpddr4_dmem_1d_v202201.bin \
+    lpddr4_dmem_2d_v202201.bin \
+    lpddr4_imem_1d_v202201.bin \
+    lpddr4_imem_2d_v202201.bin \
+"
+
 KERNEL_DEVICETREE ?= " \
     digi/ccimx9_bt-dtm.dtbo \
     digi/ccimx9_bt.dtbo \
diff --git a/meta-digi-arm/conf/machine/include/ccimx9.inc b/meta-digi-arm/conf/machine/include/ccimx9.inc
index 9fba16f9b..81fb92eb7 100644
--- a/meta-digi-arm/conf/machine/include/ccimx9.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx9.inc
@@ -30,13 +30,6 @@ BOOTABLE_FILENAME = "${UBOOT_PREFIX}-${MACHINE}.bin"
 SDIMG_BOOTLOADER = "${DEPLOY_DIR_IMAGE}/${BOOTABLE_FILENAME}"
 BOOTLOADER_SEEK_USERDATA = "32"
 
-DDR_FIRMWARE_NAME = " \
-    lpddr4_dmem_1d_v202201.bin \
-    lpddr4_dmem_2d_v202201.bin \
-    lpddr4_imem_1d_v202201.bin \
-    lpddr4_imem_2d_v202201.bin \
-"
-
 MACHINE_FEATURES += "pci wifi bluetooth"
 MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse"