BSP: allow external device tree injection in source code directly

Signed-off-by: Sebastien GANDON <[email protected]>

Author: SebastienGandon

recipes-bsp/u-boot/u-boot-stm32mp-common_2023.10.inc

@@ -17,6 +17,7 @@ SRCREV  = "4459ed60cb1e0562bc5b40405e2b4b9bbf766d57"
 
 SRC_URI += "\
     file://0001-v2023.10-stm32mp-r1.patch \
+    file://0099-Add-external-var-to-allow-build-of-new-devicetree-fi.patch \
     "
 
 # debug and trace

recipes-bsp/u-boot/u-boot-stm32mp/0099-Add-external-var-to-allow-build-of-new-devicetree-fi.patch

@@ -0,0 +1,29 @@
+From 1905589e8153c0b8a8f2755820b88082ab9e99d7 Mon Sep 17 00:00:00 2001
+From: Christophe Priouzeau <[email protected]>
+Date: Fri, 25 Nov 2022 09:58:46 +0100
+Subject: [PATCH 2/2] Add external var to allow build of new devicetree file
+
+Signed-off-by: Romuald JEANNE <[email protected]>
+---
+ arch/arm/dts/Makefile | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
+index a7b0d10b46..fbce7f538a 100644
+--- a/arch/arm/dts/Makefile
++++ b/arch/arm/dts/Makefile
+@@ -1,5 +1,11 @@
+ # SPDX-License-Identifier: GPL-2.0+
+ 
++DEVICE_TREE_EXT ?=
++
++ifneq ($(DEVICE_TREE_EXT),)
++dtb-y += $(DEVICE_TREE_EXT)
++endif
++
+ dtb-$(CONFIG_TARGET_SMARTWEB) += at91sam9260-smartweb.dtb
+ dtb-$(CONFIG_TARGET_TAURUS) += at91sam9g20-taurus.dtb
+ dtb-$(CONFIG_TARGET_CORVUS) += at91sam9g45-corvus.dtb
+-- 
+2.25.1
+

recipes-bsp/u-boot/u-boot-stm32mp/README.HOW_TO.txt

@@ -189,9 +189,9 @@ To compile U-Boot source code:
     $ make -f $PWD/../Makefile.sdk all
 To compile U-Boot source code for a specific config:
   - Compile default U-Boot configuration but applying specific devicetree(s):
-    $ make -f $PWD/../Makefile.sdk DEVICETREE="<devicetree1> <devicetree2>" all
+    $ make -f $PWD/../Makefile.sdk DEVICE_TREE="<devicetree1> <devicetree2>" all
   - Compile for a specific U-Boot configuration:
-    $ make -f $PWD/../Makefile.sdk UBOOT_CONFIG=default UBOOT_DEFCONFIG=stm32mp15_defconfig UBOOT_BINARY=u-boot.dtb DEVICETREE=stm32mp157f-dk2 all
+    $ make -f $PWD/../Makefile.sdk UBOOT_CONFIG=default UBOOT_DEFCONFIG=stm32mp15_defconfig UBOOT_BINARY=u-boot.dtb DEVICE_TREE=stm32mp157f-dk2 all
 To compile U-Boot source code and overwrite the default FIP artifacts with built artifacts:
     $> rm -rf $FIP_DEPLOYDIR_ROOT/u-boot/*
     $> make -f $PWD/../Makefile.sdk DEPLOYDIR=$FIP_DEPLOYDIR_ROOT/u-boot all

recipes-security/optee/optee-os-stm32mp-archiver.inc

@@ -128,7 +128,7 @@ optee-deploy := \$(foreach config, \$(OPTEE_CONFIG), \$(foreach soc, ${STM32MP_S
 
 optee-compile:= \$(foreach config, \$(OPTEE_CONFIG), \$(foreach soc, ${STM32MP_SOC_NAME}, \$(foreach dt, \$(if \$(CFG_EMBED_DTB_SOURCE_FILE), \$(CFG_EMBED_DTB_SOURCE_FILE),\$(OPTEE_DEVICETREE_\$(config))), \$(if \$(findstring \$(soc),\$(dt)), tee-\$(config)-\$(soc)-\$(dt),) )))
 
-optee: \$(optee-compile)
+optee: \$(optee-compile) \$(optee-deploy)
 
 fip: \$(optee-deploy)
 	for fipconfig in \$(FIP_CONFIG) ; do \\