conf: Sync KERNEL_DEVICETREE(_PREFIX) with upstream

Some of the settings for KERNEL_DEVICETREE_PREFIX were missed in the
first pass.  Additionally, some new dts files that were not present in
upstream are now there and can be updated in KERNEL_DEVICETREE.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>

3 files changed, 13 insertions, 2 deletions

diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
index 337818a4..2ee1d949 100644
--- a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
@@ -7,9 +7,13 @@ require conf/machine/include/j721s2.inc
 TFA_K3_USART = "0x8"
 OPTEE_K3_USART = "0x8"
 
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-j721s2 \
+    ti/k3-j7200-mcspi-loopback \
+"
+
 KERNEL_DEVICETREE = " \
     ti/k3-j721s2-common-proc-board.dtb \
-    ti/k3-j721s2-gesi-exp-board.dtbo \
 "
 
 UBOOT_MACHINE = "j721s2_hs_evm_a72_defconfig"
diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf
index 7971ad73..f0d04a89 100644
--- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
@@ -12,7 +12,9 @@ KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-j7200-mcspi-loopback \
 "
 
-KERNEL_DEVICETREE = ""
+KERNEL_DEVICETREE = " \
+    ti/k3-j784s4-evm.dtb \
+"
 
 UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
 
diff --git a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
index 123de8c1..89803598 100644
--- a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf
@@ -8,6 +8,11 @@ TFA_K3_USART = "0x8"
 OPTEEMACHINE = "k3-j784s4"
 OPTEE_K3_USART = "0x8"
 
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-j784s4 \
+    ti/k3-j7200-mcspi-loopback \
+"
+
 KERNEL_DEVICETREE = " \
     ti/k3-j784s4-evm.dtb \
 "