From 1c26e84dd1f1caa206b9e41d64242c87d0bd085b Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Fri, 29 Nov 2024 12:18:24 +0100
Subject: [PATCH] u-boot-dey: use version v2023.10 for ccmp2

Update ccmp2 platform to use the latest U-Boot v2023.10 based on the
openstlinux-6.6-yocto-scarthgap-mpu-v24.11.06 tag for Yocto 5.0 (scarthgap).

https://onedigi.atlassian.net/browse/DEL-9381

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 .../conf/machine/include/digi-defaults.inc    |  2 +-
 .../recipes-bsp/u-boot/u-boot-dey.inc         | 29 ++++++++++++-------
 ...t-dey_2022.10.bb => u-boot-dey_2023.10.bb} |  2 +-
 3 files changed, 20 insertions(+), 13 deletions(-)
 rename meta-digi-arm/recipes-bsp/u-boot/{u-boot-dey_2022.10.bb => u-boot-dey_2023.10.bb} (97%)

diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc
index 029f08f5c..0072b5d90 100644
--- a/meta-digi-arm/conf/machine/include/digi-defaults.inc
+++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc
@@ -20,7 +20,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 # ccimx93       6.6               2024.04 (packaged in imx-boot)
 # ccmp15        5.15              2021.10
 # ccmp13        5.15              2021.10
-# ccmp25        6.6               2022.10
+# ccmp25        6.6               2023.10
 #
 
 # Help variables used in recipes
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc
index 83edbcf49..58f4abc40 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc
@@ -220,7 +220,6 @@ do_compile:append:ccmp1() {
 
 BOOT_TOOLS = "imx-boot-tools"
 BOOT_TOOLS:ccmp1 = "u-boot"
-BOOT_TOOLS:ccmp2 = "u-boot"
 
 do_deploy:append:ccimx8m() {
 	# Deploy u-boot-nodtb.bin and ccimx8m[m|n]-dvk.dtb, to be packaged in boot binary by imx-boot
@@ -270,16 +269,24 @@ do_deploy:append:ccmp1() {
 	fi
 }
 
-do_deploy:append:ccmp2() {
-	# Deploy u-boot-nodtb.bin and ccmp2x-dvk-xxxx.dtb, to be packaged in fip binary by tf-a
-	install -d ${DEPLOYDIR}/${BOOT_TOOLS}
-	if [ -n "${UBOOT_DEVICETREE}" ]; then
-		for devicetree in ${UBOOT_DEVICETREE}; do
-			# Install u-boot dtb
-			install -m 644 ${B}/${config}/arch/arm/dts/${devicetree}.dtb ${DEPLOYDIR}/${BOOT_TOOLS}/${FIP_UBOOT_DTB}-${devicetree}.dtb
-		done
-	fi
-	install -m 0777 ${B}/${config}/u-boot-nodtb.bin  ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin
+FIP_DIR_UBOOT  ?= "/u-boot"
+
+# Deploy u-boot artifacts, to be packaged in fip binary by fip-stm32mp recipe
+u_boot_sysroot_populate() {
+	local dest="${SYSROOT_DESTDIR}/${FIP_DIR_UBOOT}"
+
+	install -d ${dest}
+	for config in ${UBOOT_MACHINE}; do
+		if [ -n "${UBOOT_DEVICETREE}" ]; then
+			for devicetree in ${UBOOT_DEVICETREE}; do
+				# Install u-boot dtb
+				install -m 644 ${B}/${config}/arch/arm/dts/${devicetree}.dtb ${dest}/${FIP_UBOOT_DTB}-${devicetree}.dtb
+			done
+		fi
+		install -m 0777 ${B}/${config}/u-boot-nodtb.bin  ${dest}/u-boot-nodtb-${devicetree}.bin
+	done
 }
+SYSROOT_PREPROCESS_FUNCS:ccmp2 =+ "u_boot_sysroot_populate"
+SYSROOT_DIRS:append:ccmp2 = " ${FIP_DIR_UBOOT}"
 
 SYSROOT_DIRS += "/boot"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.10.bb
similarity index 97%
rename from meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb
rename to meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.10.bb
index 11f0da850..bbb5f047e 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.10.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
 DEPENDS += "flex-native bison-native"
 DEPENDS += "python3-setuptools-native"
 
-SRCBRANCH = "v2022.10/master"
+SRCBRANCH = "v2023.10/master"
 SRCREV = "${AUTOREV}"
 
 SRC_URI += " \