From 5e0dffe234b39b0845f84a7ffbd1f0181baeaf9f Mon Sep 17 00:00:00 2001 From: Ryan Eatmon Date: Mon, 20 Apr 2026 09:33:04 -0500 Subject: [PATCH] machine: Fix UBOOT_CONFIG setting for tie-test-builds It was pointed out that j722s-evm-k3r5 was incorrectly setup and would not build correctly out of the box. This is due to the fact that we set both UBOOT_MACHINE and UBOOT_CONFIG by default. This was a mistake. While looking into this newish feature I also found that another platform was using a prepend, when it really should just be setting the value for tie-test-builds. Signed-off-by: Ryan Eatmon --- meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf | 2 +- meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf index 4ceb81af..c3b028ea 100644 --- a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf @@ -8,6 +8,6 @@ UBOOT_MACHINE = "am65x_evm_r5_defconfig" UBOOT_MACHINE:tie-test-builds = "" UBOOT_CONFIG = "" -UBOOT_CONFIG:prepend:tie-test-builds = "usbdfu main" +UBOOT_CONFIG:tie-test-builds = "usbdfu main" UBOOT_CONFIG[main] = "am65x_evm_r5_defconfig" UBOOT_CONFIG[usbdfu] = "am65x_evm_r5_usbdfu_defconfig" diff --git a/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf index 5df4edfe..3cb95142 100644 --- a/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf @@ -7,8 +7,8 @@ require conf/machine/include/k3r5.inc UBOOT_MACHINE = "j722s_evm_r5_defconfig" UBOOT_MACHINE:tie-test-builds = "" -UBOOT_CONFIG = "main" -UBOOT_CONFIG:prepend:tie-test-builds = "usbdfu " +UBOOT_CONFIG = "" +UBOOT_CONFIG:tie-test-builds = "usbdfu main" UBOOT_CONFIG[main] = "j722s_evm_r5_defconfig" UBOOT_CONFIG[usbdfu] = "j722s_evm_r5_defconfig"