From a96f917db84b3e803f80a67a6f6955da52d94e74 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Thu, 18 Sep 2025 08:28:40 -0500 Subject: [PATCH] ti-bsp: Use same version for both UM and KM driver The DRIVER and matching UMLIBS must always match, no need to define a version number for both. Keep this simple and remove the extra defines. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon --- meta-beagle/conf/machine/include/beagle-bsp.inc | 4 ---- meta-ti-bsp/conf/machine/include/ti-bsp.inc | 10 ++-------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/meta-beagle/conf/machine/include/beagle-bsp.inc b/meta-beagle/conf/machine/include/beagle-bsp.inc index d180c297..448e2086 100644 --- a/meta-beagle/conf/machine/include/beagle-bsp.inc +++ b/meta-beagle/conf/machine/include/beagle-bsp.inc @@ -18,10 +18,8 @@ KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_12 = "" BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_12 = "ti-sgx-ddk-km" BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_12 = "1.17%" -BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_12 = "1.17%" BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_12 = "ti-img-rogue-driver" BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_12 = "24%" -BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_12 = "24%" BSP_MESA_PVR_VERSION:bsp-bb_org-6_12 = "24%" # GC320 support requires out-of-tree drivers not yet available in bb.org 6.12 @@ -41,10 +39,8 @@ KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_6 = "" BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-sgx-ddk-km" BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_6 = "1.17%" -BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_6 = "1.17%" BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-img-rogue-driver" BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_6 = "24%" -BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_6 = "24%" BSP_MESA_PVR_VERSION:bsp-bb_org-6_6 = "24%" # GC320 support requires out-of-tree drivers not yet available in bb.org 6.6 diff --git a/meta-ti-bsp/conf/machine/include/ti-bsp.inc b/meta-ti-bsp/conf/machine/include/ti-bsp.inc index b4fe0676..0ea7bd7b 100644 --- a/meta-ti-bsp/conf/machine/include/ti-bsp.inc +++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc @@ -44,10 +44,8 @@ BSP_BOOTLOADER_VERSION:bsp-ti-6_12 = "2025.01%" BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_12 = "ti-sgx-ddk-km" BSP_SGX_DRIVER_VERSION:bsp-ti-6_12 = "1.17%" -BSP_SGX_UMLIBS_VERSION:bsp-ti-6_12 = "1.17%" BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_12 = "ti-img-rogue-driver" BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_12 = "24%" -BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_12 = "24%" BSP_MESA_PVR_VERSION:bsp-ti-6_12 = "24%" # ========== @@ -61,10 +59,8 @@ BSP_BOOTLOADER_VERSION:bsp-ti-6_6 = "2024.04%" BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-sgx-ddk-km" BSP_SGX_DRIVER_VERSION:bsp-ti-6_6 = "1.17%" -BSP_SGX_UMLIBS_VERSION:bsp-ti-6_6 = "1.17%" BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-img-rogue-driver" BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_6 = "24%" -BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_6 = "24%" BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "24%" # GC320 support requires out-of-tree drivers not yet available in 6.6 @@ -84,8 +80,6 @@ BSP_SGX_DRIVER_PROVIDER ?= "" BSP_SGX_DRIVER_VERSION ?= "" BSP_ROGUE_DRIVER_PROVIDER ?= "" BSP_ROGUE_DRIVER_VERSION ?= "" -BSP_SGX_UMLIBS_VERSION ?= "" -BSP_ROGUE_UMLIBS_VERSION ?= "" BSP_MESA_PVR_VERSION ?= "" # ========== @@ -101,7 +95,7 @@ PREFERRED_VERSION_${BSP_BOOTLOADER_PROVIDER} ?= "${BSP_BOOTLOADER_VERSION}" # GPU provider gets set in machine configs, as some machines are headless # Select default preferred versions here PREFERRED_VERSION_ti-sgx-ddk-km ?= "${BSP_SGX_DRIVER_VERSION}" -PREFERRED_VERSION_ti-sgx-ddk-um ?= "${BSP_SGX_UMLIBS_VERSION}" +PREFERRED_VERSION_ti-sgx-ddk-um ?= "${BSP_SGX_DRIVER_VERSION}" PREFERRED_VERSION_ti-img-rogue-driver ?= "${BSP_ROGUE_DRIVER_VERSION}" -PREFERRED_VERSION_ti-img-rogue-umlibs ?= "${BSP_ROGUE_UMLIBS_VERSION}" +PREFERRED_VERSION_ti-img-rogue-umlibs ?= "${BSP_ROGUE_DRIVER_VERSION}" PREFERRED_VERSION_mesa-pvr ?= "${BSP_MESA_PVR_VERSION}"