From 91baf1643ab0f9ebe4b1b466121ffde083bd2360 Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Tue, 6 Sep 2022 13:59:50 +0200
Subject: [PATCH] u-boot-dey: add recipe for v2021.10

This commit moves the ccmp15 platform to build U-Boot v2021.10

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc     |  8 ++++++++
 .../recipes-bsp/u-boot/u-boot-dey_2021.04.bb         |  2 +-
 .../recipes-bsp/u-boot/u-boot-dey_2021.10.bb         | 12 ++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb

diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc
index b44d81226..ecbb3255a 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc
+++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc
@@ -199,6 +199,7 @@ do_deploy:append() {
 }
 
 BOOT_TOOLS = "imx-boot-tools"
+BOOT_TOOLS:ccmp1 = "u-boot"
 
 do_deploy:append:ccimx8x() {
 	# Move all U-Boot artifacts to the imx-boot-tools folder
@@ -228,3 +229,10 @@ do_deploy:append:ccimx8m() {
 		unset  i
 	fi
 }
+
+do_deploy:append:ccmp1() {
+	# Deploy u-boot-nodtb.bin and ccmp1x-dvk.dtb, to be packaged in fip binary by tf-a
+	install -d ${DEPLOYDIR}/${BOOT_TOOLS}
+	install -m 0777 ${B}/${config}/arch/arm/dts/${UBOOT_DTB_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}/${FIP_UBOOT_DTB}-ccmp15-dvk-${FIP_UBOOT_CONFIG}.dtb
+	install -m 0777 ${B}/${config}/u-boot-nodtb.bin  ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin
+}
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.04.bb
index 06da6aae5..a7125775d 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.04.bb
@@ -8,4 +8,4 @@ DEPENDS += "flex-native bison-native"
 SRCBRANCH = "v2021.04/master"
 SRCREV = "${AUTOREV}"
 
-COMPATIBLE_MACHINE = "(ccimx8mp|ccmp15)"
+COMPATIBLE_MACHINE = "(ccimx8mp)"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb
new file mode 100644
index 000000000..95d2c1904
--- /dev/null
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb
@@ -0,0 +1,12 @@
+# Copyright (C) 2022 Digi International
+
+require digi-u-boot.inc
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
+
+DEPENDS += "flex-native bison-native"
+DEPENDS += "python3-setuptools-native"
+
+SRCBRANCH = "v2021.10/master"
+SRCREV = "${AUTOREV}"
+
+COMPATIBLE_MACHINE = "(ccmp1)"