summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Eatmon <reatmon@ti.com>2025-01-08 08:37:34 -0600
committerRyan Eatmon <reatmon@ti.com>2025-01-22 15:08:56 -0600
commit7f0289d6c806d38c3c14189f254903fc22101a81 (patch)
treeb5dcba8e27b54c521e3bbd68906b258980e75564
parent8ed52886aa393f50891e19d085e2acd57535c366 (diff)
downloadmeta-ti-7f0289d6c806d38c3c14189f254903fc22101a81.tar.gz
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 <reatmon@ti.com>
-rw-r--r--meta-ti-bsp/conf/machine/include/ti-bsp.inc2
-rw-r--r--meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb2
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.12.bb2
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb2
4 files changed, 1 insertions, 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 @@
4# well as a dedicated machine override. 4# well as a dedicated machine override.
5 5
6# Supported options are: mainline, next, ti-6_12, ti-6_6, ti-6_1 6# Supported options are: mainline, next, ti-6_12, ti-6_6, ti-6_1
7TI_PREFERRED_BSP ??= "ti-6_6" 7TI_PREFERRED_BSP ??= "ti-6_12"
8 8
9# Use bsp-* namespace for overrides 9# Use bsp-* namespace for overrides
10MACHINEOVERRIDES =. "bsp-${TI_PREFERRED_BSP}:" 10MACHINEOVERRIDES =. "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 @@
1require u-boot-ti.inc 1require u-boot-ti.inc
2 2
3DEFAULT_PREFERENCE = "-1"
4
5include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''} 3include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
6 4
7PR = "r0" 5PR = "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 @@
1require linux-ti-staging_6.12.bb 1require linux-ti-staging_6.12.bb
2 2
3DEFAULT_PREFERENCE = "-1"
4
5# Look in the generic major.minor directory for files 3# Look in the generic major.minor directory for files
6# This will have priority over generic non-rt path 4# This will have priority over generic non-rt path
7FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.12:" 5FILESEXTRAPATHS: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"
6inherit ti-secdev 6inherit ti-secdev
7inherit kernel 7inherit kernel
8 8
9DEFAULT_PREFERENCE = "-1"
10
11require recipes-kernel/linux/setup-defconfig.inc 9require recipes-kernel/linux/setup-defconfig.inc
12require recipes-kernel/linux/ti-kernel.inc 10require recipes-kernel/linux/ti-kernel.inc
13include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} 11include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''}