conf: machine: Include merged device trees in the list of generated dtbs

Add support for dtbs that are generated by merging multiple .dtb and .dtbo
files in the /boot directory of the root filesystem.These merged device trees
are defined in ti-linux-kernel Makefile[1]. Include them using the
KERNEL_DEVICETREE_DTBMERGE variable.

[1]: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/tree/arch/arm64/boot/dts/ti/Makefile?h=ti-linux-6.12.y

Signed-off-by: Telukula Jeevan Kumar Sahu <j-sahu@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>

2 files changed, 12 insertions, 0 deletions

diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc
index e79e6e61..33fc6240 100644
--- a/meta-ti-bsp/conf/machine/include/am64xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am64xx.inc
@@ -5,6 +5,10 @@ SOC_FAMILY:append = ":am64xx"
 
 KERNEL_DEVICETREE_PREFIX = "ti/k3-am642"
 
+KERNEL_DEVICETREE_DTBMERGE = " \
+    ti/k3-am642-evm-nand.dtb \
+"
+
 KERNEL_DEVICETREE = " \
     ti/k3-am642-evm-icssg1-dualemac-mii.dtbo \
     ti/k3-am642-evm-icssg1-dualemac.dtbo \
diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc
index 7255bb30..d70bb22d 100644
--- a/meta-ti-bsp/conf/machine/include/am65xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
@@ -10,6 +10,14 @@ PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
 
 KERNEL_DEVICETREE_PREFIX = "ti/k3-am654"
 
+KERNEL_DEVICETREE_DTBMERGE = " \
+    ti/k3-am654-gp-evm.dtb \
+    ti/k3-am654-evm.dtb \
+    ti/k3-am654-idk.dtb \
+    ti/k3-am6548-iot2050-advanced-m2-bkey-ekey-pcie.dtb \
+    ti/k3-am6548-iot2050-advanced-m2-bkey-usb3.dtb \
+"
+
 KERNEL_DEVICETREE = " \
     ti/k3-am654-base-board-rocktech-rk101-panel.dtbo \
     ti/k3-am654-base-board.dtb \