@@ -20,7 +20,6 @@ KERNEL_DEVICETREE = " \
ti/k3-j721s2-common-proc-board.dtb \
ti/k3-j721s2-evm-gesi-exp-board.dtbo \
ti/k3-j721s2-evm-pcie1-ep.dtbo \
- ti/k3-j721s2-evm-ub954.dtbo \
"
UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
@@ -13,6 +13,7 @@ KERNEL_DEVICETREE_PREFIX = " \
ti/k3-j7200-evm-mcspi-loopback \
ti/k3-j721s2-evm-csi2-ov5640 \
ti/k3-j721s2-evm-fusion \
+ ti/k3-j721s2-evm-ub954 \
ti/k3-am69-sk \
ti/k3-v3link \
"
@@ -23,7 +24,6 @@ KERNEL_DEVICETREE = " \
ti/k3-j784s4-evm-quad-port-eth-exp1.dtbo \
ti/k3-j784s4-evm-usxgmii-exp1-exp2.dtbo \
ti/k3-j784s4-evm.dtb \
- ti/k3-j721s2-evm-ub954.dtbo \
"
UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
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> --- meta-ti-bsp/conf/machine/j721s2-evm.conf | 1 - meta-ti-bsp/conf/machine/j784s4-evm.conf | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)