From 14f885e2cb4de9b68362f3c38868f3879db45595 Mon Sep 17 00:00:00 2001 From: Ryan Eatmon Date: Thu, 31 Oct 2024 15:22:17 -0500 Subject: ti-bsp: Tighten up versions for PREFERRED_VERSION PREFERRED_VERSION matches against the PV in the recipe, not against the file name. With the upcoming 6.12, the 6.1 kernel version string was a little too loose. The "6.1%" could glob onto the 6.12 recipe. Take this time to also clean up a couple of the other versions and narrow them down. Signed-off-by: Ryan Eatmon --- meta-ti-bsp/conf/machine/include/ti-bsp.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-ti-bsp/conf/machine/include/ti-bsp.inc b/meta-ti-bsp/conf/machine/include/ti-bsp.inc index 2eb3bd19..d27bbe3c 100644 --- a/meta-ti-bsp/conf/machine/include/ti-bsp.inc +++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc @@ -53,7 +53,7 @@ MACHINE_FEATURES:remove:bsp-ti-6_12 = "gpu" # TI staging kernel 6.6, u-boot 2024.04 # ========== BSP_KERNEL_PROVIDER:bsp-ti-6_6 = "linux-ti-staging" -BSP_KERNEL_VERSION:bsp-ti-6_6 = "6.6%" +BSP_KERNEL_VERSION:bsp-ti-6_6 = "6.6.%" BSP_BOOTLOADER_PROVIDER:bsp-ti-6_6 = "u-boot-ti-staging" BSP_BOOTLOADER_VERSION:bsp-ti-6_6 = "2024.04%" @@ -68,9 +68,9 @@ BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "23%" # TI staging kernel 6.1, u-boot 2023.04 # ========== BSP_KERNEL_PROVIDER:bsp-ti-6_1 = "linux-ti-staging" -BSP_KERNEL_VERSION:bsp-ti-6_1 = "6.1%" +BSP_KERNEL_VERSION:bsp-ti-6_1 = "6.1.%" BSP_BOOTLOADER_PROVIDER:bsp-ti-6_1 = "u-boot-ti-staging" -BSP_BOOTLOADER_VERSION:bsp-ti-6_1 = "2023%" +BSP_BOOTLOADER_VERSION:bsp-ti-6_1 = "2023.04%" BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_1 = "ti-sgx-ddk-km" BSP_SGX_DRIVER_VERSION:bsp-ti-6_1 = "1.17%" -- cgit v1.2.3-54-g00ecf