summaryrefslogtreecommitdiffstats
path: root/meta-yocto-bsp
diff options
context:
space:
mode:
authorKevin Hao <kexin.hao@windriver.com>2024-01-20 21:42:53 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-01-22 13:45:33 +0000
commit640927625e490e0ae974ddd26252b1e354b4bf3c (patch)
treeab0dfb0aba7fc3b89cf9738e2d777c0952384791 /meta-yocto-bsp
parente0ee1b3160f682435de2a700ae5a78a4e8015dfe (diff)
downloadpoky-640927625e490e0ae974ddd26252b1e354b4bf3c.tar.gz
yocto-bsp: Bump the default kernel to v6.6
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. (From meta-yocto rev: 58ac51b7a44fbb165311c7226ae8b15cd004114d) Signed-off-by: Kevin Hao <kexin.hao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto-bsp')
-rw-r--r--meta-yocto-bsp/conf/machine/beaglebone-yocto.conf7
-rw-r--r--meta-yocto-bsp/conf/machine/include/genericx86-common.inc2
-rw-r--r--meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend19
3 files changed, 24 insertions, 4 deletions
diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
index 06a49f45f7..459c83f5c2 100644
--- a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
+++ b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
@@ -20,10 +20,11 @@ do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do
20SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" 20SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0"
21 21
22PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 22PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
23PREFERRED_VERSION_linux-yocto ?= "6.1%" 23PREFERRED_VERSION_linux-yocto ?= "6.6%"
24 24
25KERNEL_IMAGETYPE = "zImage" 25KERNEL_IMAGETYPE = "zImage"
26KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" 26DTB_FILES = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb"
27KERNEL_DEVICETREE = '${@' '.join('ti/omap/%s' % d for d in '${DTB_FILES}'.split())}'
27 28
28PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" 29PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
29 30
@@ -33,7 +34,7 @@ UBOOT_MACHINE = "am335x_evm_defconfig"
33 34
34MACHINE_FEATURES = "usbgadget usbhost vfat alsa" 35MACHINE_FEATURES = "usbgadget usbhost vfat alsa"
35 36
36IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} ${SPL_BINARY} ${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE}" 37IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} ${SPL_BINARY} ${KERNEL_IMAGETYPE} ${DTB_FILES}"
37 38
38# support runqemu 39# support runqemu
39EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" 40EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
index 24d427a360..50a233dd8f 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
2require conf/machine/include/x86/qemuboot-x86.inc 2require conf/machine/include/x86/qemuboot-x86.inc
3MACHINE_FEATURES += "wifi efi pcbios" 3MACHINE_FEATURES += "wifi efi pcbios"
4 4
5PREFERRED_VERSION_linux-yocto ?= "6.1%" 5PREFERRED_VERSION_linux-yocto ?= "6.6%"
6PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 6PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
7PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" 7PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
8XSERVER ?= "${XSERVER_X86_BASE} \ 8XSERVER ?= "${XSERVER_X86_BASE} \
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend
new file mode 100644
index 0000000000..49eed162d9
--- /dev/null
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend
@@ -0,0 +1,19 @@
1KBRANCH:genericx86 = "v6.6/standard/base"
2KBRANCH:genericx86-64 = "v6.6/standard/base"
3KBRANCH:beaglebone-yocto = "v6.6/standard/beaglebone"
4
5KMACHINE:genericx86 ?= "common-pc"
6KMACHINE:genericx86-64 ?= "common-pc-64"
7KMACHINE:beaglebone-yocto ?= "beaglebone"
8
9SRCREV_machine:genericx86 ?= "195b2994f955071be3dd16ff61127dbc6b2e0069"
10SRCREV_machine:genericx86-64 ?= "195b2994f955071be3dd16ff61127dbc6b2e0069"
11SRCREV_machine:beaglebone-yocto ?= "195b2994f955071be3dd16ff61127dbc6b2e0069"
12
13COMPATIBLE_MACHINE:genericx86 = "genericx86"
14COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64"
15COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto"
16
17LINUX_VERSION:genericx86 = "6.6.12"
18LINUX_VERSION:genericx86-64 = "6.6.12"
19LINUX_VERSION:beaglebone-yocto = "6.6.12"