From 7f0289d6c806d38c3c14189f254903fc22101a81 Mon Sep 17 00:00:00 2001 From: Ryan Eatmon Date: Wed, 8 Jan 2025 08:37:34 -0600 Subject: ti-bsp: Change to 6.12 as the default We are moving to 6.12 to be our new LTS, so we are switching the default BSP to that. You can still access the 6.6 kernel if you need to by using the BSP system and setting TI_PREFERRED_BSP = "ti-6_6" in your local.conf. Current known issues: - Hardware graphics is disabled until we get a patch that updates the patches to work with the 6.12 kernel. Falling back to software rendering. - am62xxsip-evm and j742s2-evm are not supported in the 2025.01 u-boot yet. They will fail to build until the u-boot recipe is updated to point to a commit that fixes their support. Signed-off-by: Ryan Eatmon --- meta-ti-bsp/conf/machine/include/ti-bsp.inc | 2 +- meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb | 2 -- meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.12.bb | 2 -- meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb | 2 -- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/meta-ti-bsp/conf/machine/include/ti-bsp.inc b/meta-ti-bsp/conf/machine/include/ti-bsp.inc index 083177dc..f19a0c9c 100644 --- a/meta-ti-bsp/conf/machine/include/ti-bsp.inc +++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc @@ -4,7 +4,7 @@ # well as a dedicated machine override. # Supported options are: mainline, next, ti-6_12, ti-6_6, ti-6_1 -TI_PREFERRED_BSP ??= "ti-6_6" +TI_PREFERRED_BSP ??= "ti-6_12" # Use bsp-* namespace for overrides MACHINEOVERRIDES =. "bsp-${TI_PREFERRED_BSP}:" diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb index e71008fa..4a3b347d 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb @@ -1,7 +1,5 @@ require u-boot-ti.inc -DEFAULT_PREFERENCE = "-1" - include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''} PR = "r0" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.12.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.12.bb index 8ce23368..b0dcab52 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.12.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.12.bb @@ -1,7 +1,5 @@ require linux-ti-staging_6.12.bb -DEFAULT_PREFERENCE = "-1" - # Look in the generic major.minor directory for files # This will have priority over generic non-rt path FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.12:" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb index 7f61b8ab..2ddced64 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb @@ -6,8 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" inherit ti-secdev inherit kernel -DEFAULT_PREFERENCE = "-1" - require recipes-kernel/linux/setup-defconfig.inc require recipes-kernel/linux/ti-kernel.inc include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} -- cgit v1.2.3-54-g00ecf