From 3cd4cacb58fa9e0e8a08b8c034ee399240c165e7 Mon Sep 17 00:00:00 2001 From: Kevin Hao Date: Sat, 14 Dec 2024 20:03:17 +0800 Subject: [PATCH] yocto-bsp: Bump the default kernel to v6.12 for beaglebone There have been no specific patches on beaglebone branche for many years, so I have decided to switch to using the base branch for this machine. This approach eliminates the need to adjust the corresponding SRCREV_machine and LINUX_VERSION with each stable kernel version bump. (From meta-yocto rev: 1570badbf93511f370614c21ccd967af28549b2c) Signed-off-by: Kevin Hao Signed-off-by: Richard Purdie --- meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | 2 +- meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.12.bbappend | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index 459c83f5c2..db9cfec497 100644 --- a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +++ b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf @@ -20,7 +20,7 @@ do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "6.6%" +PREFERRED_VERSION_linux-yocto ?= "6.12%" KERNEL_IMAGETYPE = "zImage" DTB_FILES = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.12.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.12.bbappend index 97e512fbc5..768f100067 100644 --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.12.bbappend +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.12.bbappend @@ -1,4 +1,7 @@ COMPATIBLE_MACHINE:genericarm64 = "genericarm64" +COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto" + +KMACHINE:beaglebone-yocto ?= "beaglebone" # Incorporate fixes post 6.12.3 SRCREV_meta:genericarm64 = "9ee4baec963b10d213c060622fce6d2b34166f40"