summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Eatmon <reatmon@ti.com>2025-03-11 11:09:00 -0500
committerRyan Eatmon <reatmon@ti.com>2025-03-11 11:26:39 -0500
commit26e5ac463ede2d5098d23ce7cbfba35e48773db2 (patch)
tree9341c289ec0c5c02d3f7b7c390cdc136fd8a500c
parent2a081fd3b604aaf0499021bcd41f1b455cdbbabf (diff)
downloadmeta-ti-26e5ac463ede2d5098d23ce7cbfba35e48773db2.tar.gz
conf: machine: j721s2/j784s4: Fix overlays for DS90UB954
The previous commit incorrectly added the k3-j721s2-evm-ub954.dtbo to the KERNEL_DEVICETREE and it was missed during a quick review. The correct way to add dtbs is to add a prefix string to the KERNEL_DEVICETREE_PREFIX variable so that all files that match the string will be picked up. This allows for multiple kernels to be swapped out that may have different DTBs in their respective trees and not break a build. The upstream testing on the kernel will automatically update the KERNEL_DEVICETREE variable when the final kernel version is available. That way the KERNEL_DEVICETREE always points to what is available in the mainline. Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r--meta-ti-bsp/conf/machine/j721s2-evm.conf1
-rw-r--r--meta-ti-bsp/conf/machine/j784s4-evm.conf2
2 files changed, 1 insertions, 2 deletions
diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
index f0600f33..5cb28309 100644
--- a/meta-ti-bsp/conf/machine/j721s2-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf
@@ -20,7 +20,6 @@ KERNEL_DEVICETREE = " \
20 ti/k3-j721s2-common-proc-board.dtb \ 20 ti/k3-j721s2-common-proc-board.dtb \
21 ti/k3-j721s2-evm-gesi-exp-board.dtbo \ 21 ti/k3-j721s2-evm-gesi-exp-board.dtbo \
22 ti/k3-j721s2-evm-pcie1-ep.dtbo \ 22 ti/k3-j721s2-evm-pcie1-ep.dtbo \
23 ti/k3-j721s2-evm-ub954.dtbo \
24" 23"
25 24
26UBOOT_MACHINE = "j721s2_evm_a72_defconfig" 25UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf
index 3940a95f..bf53b07c 100644
--- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
@@ -13,6 +13,7 @@ KERNEL_DEVICETREE_PREFIX = " \
13 ti/k3-j7200-evm-mcspi-loopback \ 13 ti/k3-j7200-evm-mcspi-loopback \
14 ti/k3-j721s2-evm-csi2-ov5640 \ 14 ti/k3-j721s2-evm-csi2-ov5640 \
15 ti/k3-j721s2-evm-fusion \ 15 ti/k3-j721s2-evm-fusion \
16 ti/k3-j721s2-evm-ub954 \
16 ti/k3-am69-sk \ 17 ti/k3-am69-sk \
17 ti/k3-v3link \ 18 ti/k3-v3link \
18" 19"
@@ -23,7 +24,6 @@ KERNEL_DEVICETREE = " \
23 ti/k3-j784s4-evm-quad-port-eth-exp1.dtbo \ 24 ti/k3-j784s4-evm-quad-port-eth-exp1.dtbo \
24 ti/k3-j784s4-evm-usxgmii-exp1-exp2.dtbo \ 25 ti/k3-j784s4-evm-usxgmii-exp1-exp2.dtbo \
25 ti/k3-j784s4-evm.dtb \ 26 ti/k3-j784s4-evm.dtb \
26 ti/k3-j721s2-evm-ub954.dtbo \
27" 27"
28 28
29UBOOT_MACHINE = "j784s4_evm_a72_defconfig" 29UBOOT_MACHINE = "j784s4_evm_a72_defconfig"