Denys, thoughts on this?
On 10/8/2024 11:33 AM, Ryan Eatmon via lists.yoctoproject.org wrote:
We were missing controlling the versions for linux-ti-staging-rt and linux-ti-staging-systest using the BSP framework. Since the PREFERRED_VERSION is not tied to the virtual/kernel we need two additional settings for those alternate kernel package names. For BSPs that do not support the RT and systest variants, just set their name to the main kernel package. Signed-off-by: Ryan Eatmon <[email protected]> --- meta-ti-bsp/conf/machine/include/ti-bsp.inc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/meta-ti-bsp/conf/machine/include/ti-bsp.inc b/meta-ti-bsp/conf/machine/include/ti-bsp.inc index 9a15e164..96321e03 100644 --- a/meta-ti-bsp/conf/machine/include/ti-bsp.inc +++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc @@ -14,6 +14,8 @@ MACHINEOVERRIDES =. "bsp-${TI_PREFERRED_BSP}:" # latest upstream/mainline kernel, u-boot # ========== BSP_KERNEL_PROVIDER:bsp-mainline = "linux-ti-mainline" +BSP_KERNEL_RT_PROVIDER:bsp-mainline = "linux-ti-mainline" +BSP_KERNEL_SYSTEST_PROVIDER:bsp-mainline = "linux-ti-mainline" BSP_KERNEL_VERSION:bsp-mainline = "%" BSP_BOOTLOADER_PROVIDER:bsp-mainline = "u-boot-ti-mainline" BSP_BOOTLOADER_VERSION:bsp-mainline = "%" @@ -27,6 +29,8 @@ MACHINE_FEATURES:remove:bsp-mainline = "gpu" # upcoming upstream/mainline kernel, u-boot # ========== BSP_KERNEL_PROVIDER:bsp-next = "linux-ti-next" +BSP_KERNEL_RT_PROVIDER:bsp-next = "linux-ti-next" +BSP_KERNEL_SYSTEST_PROVIDER:bsp-next = "linux-ti-next" BSP_KERNEL_VERSION:bsp-next = "%" BSP_BOOTLOADER_PROVIDER:bsp-next = "u-boot-ti-mainline" BSP_BOOTLOADER_VERSION:bsp-next = "%" @@ -40,6 +44,8 @@ MACHINE_FEATURES:remove:bsp-next = "gpu" # TI staging kernel 6.12, u-boot 2024.10 # ========== BSP_KERNEL_PROVIDER:bsp-ti-6_12 = "linux-ti-staging" +BSP_KERNEL_RT_PROVIDER:bsp-ti-6_12 = "linux-ti-staging-rt" +BSP_KERNEL_SYSTEST_PROVIDER:bsp-ti-6_12 = "linux-ti-staging-systest" BSP_KERNEL_VERSION:bsp-ti-6_12 = "6.12%" BSP_BOOTLOADER_PROVIDER:bsp-ti-6_12 = "u-boot-ti-staging" BSP_BOOTLOADER_VERSION:bsp-ti-6_12 = "2024.10%" @@ -53,6 +59,8 @@ MACHINE_FEATURES:remove:bsp-next = "gpu" # TI staging kernel 6.6, u-boot 2024.04 # ========== BSP_KERNEL_PROVIDER:bsp-ti-6_6 = "linux-ti-staging" +BSP_KERNEL_RT_PROVIDER:bsp-ti-6_6 = "linux-ti-staging-rt" +BSP_KERNEL_SYSTEST_PROVIDER:bsp-ti-6_6 = "linux-ti-staging-systest" 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,6 +76,8 @@ 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_RT_PROVIDER:bsp-ti-6_1 = "linux-ti-staging-rt" +BSP_KERNEL_SYSTEST_PROVIDER:bsp-ti-6_1 = "linux-ti-staging-systest" 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%" @@ -87,6 +97,8 @@ BSP_MESA_PVR_VERSION:bsp-ti-6_1 = "22%" # but may not be up-to-date with TI version # ========== BSP_KERNEL_PROVIDER:bsp-bb_org = "linux-bb.org" +BSP_KERNEL_RT_PROVIDER:bsp-bb_org = "linux-bb.org" +BSP_KERNEL_SYSTEST_PROVIDER:bsp-bb_org = "linux-bb.org" BSP_KERNEL_VERSION:bsp-bb_org = "%" BSP_BOOTLOADER_PROVIDER:bsp-bb_org = "u-boot-bb.org" BSP_BOOTLOADER_VERSION:bsp-bb_org = "%" @@ -105,6 +117,8 @@ BSP_MESA_PVR_VERSION:bsp-bb_org = "22%" # use default preference TI staging and SW-rendering graphics # ========== BSP_KERNEL_PROVIDER ?= "linux-ti-staging" +BSP_KERNEL_RT_PROVIDER ?= "linux-ti-staging-rt" +BSP_KERNEL_SYSTEST_PROVIDER ?= "linux-ti-staging-systest" BSP_KERNEL_VERSION ?= "%" BSP_BOOTLOADER_PROVIDER ?= "u-boot-ti-staging" BSP_BOOTLOADER_VERSION ?= "%" @@ -122,6 +136,8 @@ BSP_MESA_PVR_VERSION ?= "" # ========== PREFERRED_PROVIDER_virtual/kernel ?= "${BSP_KERNEL_PROVIDER}" PREFERRED_VERSION_${BSP_KERNEL_PROVIDER} ?= "${BSP_KERNEL_VERSION}" +PREFERRED_VERSION_${BSP_KERNEL_RT_PROVIDER} ?= "${BSP_KERNEL_VERSION}" +PREFERRED_VERSION_${BSP_KERNEL_SYSTEST_PROVIDER} ?= "${BSP_KERNEL_VERSION}" PREFERRED_PROVIDER_virtual/bootloader ?= "${BSP_BOOTLOADER_PROVIDER}" PREFERRED_PROVIDER_u-boot ?= "${BSP_BOOTLOADER_PROVIDER}" PREFERRED_VERSION_${BSP_BOOTLOADER_PROVIDER} ?= "${BSP_BOOTLOADER_VERSION}"
-- Ryan Eatmon [email protected] ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17985): https://lists.yoctoproject.org/g/meta-ti/message/17985 Mute This Topic: https://lists.yoctoproject.org/mt/108892648/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
