yocto-bsp: Bump the default kernel to v6.6 for all the machines
cover yocto-bsp: Bump the default kernel to v6.6 for all the machines
From: Kevin Hao <[email protected]>
Hi Richard,
This patch series bumps the default kernel to the v6.6 for all the reference machines, and also drop the v6.1 bbappend at the same time. There are some kernel config check warnings on the beaglebone on v6.6 kernel. A fix [1] is under review. Build and boot test for all the machines.
[1] https://lists.yoctoproject.org/g/linux-yocto/message/13504
Kevin Hao (2):
yocto-bsp: Bump the default kernel to v6.6
yocto-bsp: Drop the support for v6.1 kernel
.../conf/machine/beaglebone-yocto.conf | 7 ++++--- .../machine/include/genericx86-common.inc | 2 +- .../linux/linux-yocto_6.1.bbappend | 19 ------------------- .../linux/linux-yocto_6.6.bbappend | 19 +++++++++++++++++++ 4 files changed, 24 insertions(+), 23 deletions(-) delete mode 100644 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.1.bbappend create mode 100644 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend
Signature · 1 line
2.39.2
PATCH 1/2 yocto-bsp: Bump the default kernel to v6.6
From: Kevin Hao <[email protected]>
Create the bbappend for v6.6 and bump the default kernel to v6.6 for all the machines.
In the v6.6 kernel the dtb files for beaglebone have been moved to a vendor specific directory, so we also need to adjust the corresponding variables for its DTB generation.
--- .../conf/machine/beaglebone-yocto.conf | 7 ++++--- .../machine/include/genericx86-common.inc | 2 +- .../linux/linux-yocto_6.6.bbappend | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend
meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +4 -3
@@ -20,10 +20,11 @@ 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.1%" +PREFERRED_VERSION_linux-yocto ?= "6.6%" KERNEL_IMAGETYPE = "zImage" -KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" +DTB_FILES = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" +KERNEL_DEVICETREE = '${@' '.join('ti/omap/%s' % d for d in '${DTB_FILES}'.split())}' PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
@@ -33,7 +34,7 @@ UBOOT_MACHINE = "am335x_evm_defconfig" MACHINE_FEATURES = "usbgadget usbhost vfat alsa" -IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} ${SPL_BINARY} ${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE}" +IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} ${SPL_BINARY} ${KERNEL_IMAGETYPE} ${DTB_FILES}" # support runqemu EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
meta-yocto-bsp/conf/machine/include/genericx86-common.inc +1 -1
@@ -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.1%" +PREFERRED_VERSION_linux-yocto ?= "6.6%" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" XSERVER ?= "${XSERVER_X86_BASE} \
meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend new file +19 -0
@@ -0,0 +1,19 @@ +KBRANCH:genericx86 = "v6.6/standard/base" +KBRANCH:genericx86-64 = "v6.6/standard/base" +KBRANCH:beaglebone-yocto = "v6.6/standard/beaglebone" + +KMACHINE:genericx86 ?= "common-pc" +KMACHINE:genericx86-64 ?= "common-pc-64" +KMACHINE:beaglebone-yocto ?= "beaglebone" + +SRCREV_machine:genericx86 ?= "195b2994f955071be3dd16ff61127dbc6b2e0069" +SRCREV_machine:genericx86-64 ?= "195b2994f955071be3dd16ff61127dbc6b2e0069" +SRCREV_machine:beaglebone-yocto ?= "195b2994f955071be3dd16ff61127dbc6b2e0069" + +COMPATIBLE_MACHINE:genericx86 = "genericx86" +COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" +COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto" + +LINUX_VERSION:genericx86 = "6.6.12" +LINUX_VERSION:genericx86-64 = "6.6.12" +LINUX_VERSION:beaglebone-yocto = "6.6.12"
Signature · 1 line
2.39.2
PATCH 2/2 yocto-bsp: Drop the support for v6.1 kernel
In reply to Kevin HaoFrom: Kevin Hao <[email protected]>
The v6.1 kernel bb will be removed from the oe-core soon. So it is time to drop the support of it for the yocto-bsp machines.
--- .../linux/linux-yocto_6.1.bbappend | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.1.bbappend
meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.1.bbappend deleted +0 -19
@@ -1,19 +0,0 @@ -KBRANCH:genericx86 = "v6.1/standard/base" -KBRANCH:genericx86-64 = "v6.1/standard/base" -KBRANCH:beaglebone-yocto = "v6.1/standard/beaglebone" - -KMACHINE:genericx86 ?= "common-pc" -KMACHINE:genericx86-64 ?= "common-pc-64" -KMACHINE:beaglebone-yocto ?= "beaglebone" - -SRCREV_machine:genericx86 ?= "6ec439b4b456ce929c4c07fe457b5d6a4b468e86" -SRCREV_machine:genericx86-64 ?= "6ec439b4b456ce929c4c07fe457b5d6a4b468e86" -SRCREV_machine:beaglebone-yocto ?= "423e1996694b61fbfc8ec3bf062fc6461d64fde1" - -COMPATIBLE_MACHINE:genericx86 = "genericx86" -COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" -COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto" - -LINUX_VERSION:genericx86 = "6.1.30" -LINUX_VERSION:genericx86-64 = "6.1.30" -LINUX_VERSION:beaglebone-yocto = "6.1.20"
Signature · 1 line
2.39.2