From 2e33c422a48e026a1d7913d97129612417e356ee Mon Sep 17 00:00:00 2001 From: Kevin Hao Date: Thu, 12 Jan 2023 19:31:53 +0800 Subject: meta-yocto-bsp: Update the default kernel to 6.1 Create the corresponding 6.1 bbappend and also update the default kernel to 6.1 for all the boards. (From meta-yocto rev: 7494f08fa1c85611a1dce3444a2737ef06fc8fdf) Signed-off-by: Kevin Hao Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | 2 +- meta-yocto-bsp/conf/machine/edgerouter.conf | 2 +- .../conf/machine/include/genericx86-common.inc | 2 +- .../recipes-kernel/linux/linux-yocto_6.1.bbappend | 23 ++++++++++++++++++++++ 4 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.1.bbappend (limited to 'meta-yocto-bsp') diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index 284559c50c..362f6e040e 100644 --- a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +++ b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf @@ -24,7 +24,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "5.15%" +PREFERRED_VERSION_linux-yocto ?= "6.1%" KERNEL_IMAGETYPE = "zImage" KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" diff --git a/meta-yocto-bsp/conf/machine/edgerouter.conf b/meta-yocto-bsp/conf/machine/edgerouter.conf index 249864e9ce..ffdcf55f02 100644 --- a/meta-yocto-bsp/conf/machine/edgerouter.conf +++ b/meta-yocto-bsp/conf/machine/edgerouter.conf @@ -11,7 +11,7 @@ KERNEL_ALT_IMAGETYPE = "vmlinux.bin" KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "5.15%" +PREFERRED_VERSION_linux-yocto ?= "6.1%" SERIAL_CONSOLES = "115200;ttyS0" USE_VT ?= "0" diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc index 8c5e5522bc..e3badebf86 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 ?= "5.15%" +PREFERRED_VERSION_linux-yocto ?= "6.1%" 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.1.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.1.bbappend new file mode 100644 index 0000000000..e693cb32e4 --- /dev/null +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.1.bbappend @@ -0,0 +1,23 @@ +KBRANCH:genericx86 = "v6.1/standard/base" +KBRANCH:genericx86-64 = "v6.1/standard/base" +KBRANCH:edgerouter = "v6.1/standard/edgerouter" +KBRANCH:beaglebone-yocto = "v6.1/standard/beaglebone" + +KMACHINE:genericx86 ?= "common-pc" +KMACHINE:genericx86-64 ?= "common-pc-64" +KMACHINE:beaglebone-yocto ?= "beaglebone" + +SRCREV_machine:genericx86 ?= "872afe79c5e568acf5f971952e78caada8424df7" +SRCREV_machine:genericx86-64 ?= "872afe79c5e568acf5f971952e78caada8424df7" +SRCREV_machine:edgerouter ?= "872afe79c5e568acf5f971952e78caada8424df7" +SRCREV_machine:beaglebone-yocto ?= "872afe79c5e568acf5f971952e78caada8424df7" + +COMPATIBLE_MACHINE:genericx86 = "genericx86" +COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" +COMPATIBLE_MACHINE:edgerouter = "edgerouter" +COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto" + +LINUX_VERSION:genericx86 = "6.1.3" +LINUX_VERSION:genericx86-64 = "6.1.3" +LINUX_VERSION:edgerouter = "6.1.3" +LINUX_VERSION:beaglebone-yocto = "6.1.3" -- cgit v1.2.3-54-g00ecf