From 297e007375e8755ce2a59fc9420f7e0196ea07eb Mon Sep 17 00:00:00 2001 From: Kevin Hao Date: Sat, 14 Dec 2024 20:03:18 +0800 Subject: [PATCH] yocto-bsp: Bump the default kernel to v6.12 for x86 machines (From meta-yocto rev: 7a65cd769151a817a771cce6ee70b5437fca60e5) Signed-off-by: Kevin Hao Signed-off-by: Richard Purdie --- meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 2 +- meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.12.bbappend | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc index 50a233dd8f..943604c01c 100644 --- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc @@ -2,7 +2,7 @@ include conf/machine/include/x86/x86-base.inc require conf/machine/include/x86/qemuboot-x86.inc MACHINE_FEATURES += "wifi efi pcbios" -PREFERRED_VERSION_linux-yocto ?= "6.6%" +PREFERRED_VERSION_linux-yocto ?= "6.12%" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" XSERVER ?= "${XSERVER_X86_BASE} \ 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 768f100067..b47b3aa5a9 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,7 +1,11 @@ COMPATIBLE_MACHINE:genericarm64 = "genericarm64" COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto" +COMPATIBLE_MACHINE:genericx86 = "genericx86" +COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" KMACHINE:beaglebone-yocto ?= "beaglebone" +KMACHINE:genericx86 ?= "common-pc" +KMACHINE:genericx86-64 ?= "common-pc-64" # Incorporate fixes post 6.12.3 SRCREV_meta:genericarm64 = "9ee4baec963b10d213c060622fce6d2b34166f40"