From patchwork Tue Sep 9 15:10:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 69863 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08B80CA0FED for ; Tue, 9 Sep 2025 15:10:41 +0000 (UTC) Received: from fllvem-ot04.ext.ti.com (fllvem-ot04.ext.ti.com [198.47.19.246]) by mx.groups.io with SMTP id smtpd.web10.865.1757430630997818044 for ; Tue, 09 Sep 2025 08:10:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=CLNlKQC1; spf=pass (domain: ti.com, ip: 198.47.19.246, mailfrom: afd@ti.com) Received: from lelvem-sh02.itg.ti.com ([10.180.78.226]) by fllvem-ot04.ext.ti.com (8.15.2/8.15.2) with ESMTP id 589FASd3312741; Tue, 9 Sep 2025 10:10:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1757430628; bh=K4WDBA4MuCEpIIrbnT/jUvB8vpeRbz/gIMHdsTLVSAE=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=CLNlKQC1AUdKJDMNJ8OfwDkT3uEd7UI63N3JF9LZ7ReLmTGgnDNq6LTToSEtgLGY0 kLR/aBqOymiB6GXPpGQNc6KndgCPJ3hyXamjcVmgkyYg1W/ijrJ0vqlnW6tfpDbcEn JdN4liZ99EsdNULMo7ClqrdPwVFK6O23vKnm44nY= Received: from DFLE113.ent.ti.com (dfle113.ent.ti.com [10.64.6.34]) by lelvem-sh02.itg.ti.com (8.18.1/8.18.1) with ESMTPS id 589FAS0J3796170 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=FAIL); Tue, 9 Sep 2025 10:10:28 -0500 Received: from DFLE114.ent.ti.com (10.64.6.35) by DFLE113.ent.ti.com (10.64.6.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55; Tue, 9 Sep 2025 10:10:28 -0500 Received: from lelvem-mr05.itg.ti.com (10.180.75.9) by DFLE114.ent.ti.com (10.64.6.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55 via Frontend Transport; Tue, 9 Sep 2025 10:10:28 -0500 Received: from ula0226330.dhcp.ti.com (ula0226330.dhcp.ti.com [10.247.30.162]) by lelvem-mr05.itg.ti.com (8.18.1/8.18.1) with ESMTP id 589FASUi2825029; Tue, 9 Sep 2025 10:10:28 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , Randolph Sapp , CC: Andrew Davis Subject: [meta-ti][scarthgap][RFC 3/6] ti-bsp: Use same version for both UM and KM driver Date: Tue, 9 Sep 2025 10:10:25 -0500 Message-ID: <20250909151028.272925-3-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250909151028.272925-1-afd@ti.com> References: <20250909151028.272925-1-afd@ti.com> MIME-Version: 1.0 X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 09 Sep 2025 15:10:41 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18985 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 --- 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 a5d9a51f..dc0473de 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}"