diff options
| author | Kevin Hao <kexin.hao@windriver.com> | 2023-01-12 19:31:53 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-13 17:34:08 +0000 |
| commit | 2e33c422a48e026a1d7913d97129612417e356ee (patch) | |
| tree | 215c8336aa8e4303e810d032247c4bf855cef33c /meta-yocto-bsp/conf | |
| parent | e1a661e3d2d4d62aa0c47c2abb0a6824e1b17ede (diff) | |
| download | poky-2e33c422a48e026a1d7913d97129612417e356ee.tar.gz | |
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 <kexin.hao@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto-bsp/conf')
| -rw-r--r-- | meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | 2 | ||||
| -rw-r--r-- | meta-yocto-bsp/conf/machine/edgerouter.conf | 2 | ||||
| -rw-r--r-- | meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 2 |
3 files changed, 3 insertions, 3 deletions
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" | |||
| 24 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | 24 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" |
| 25 | 25 | ||
| 26 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 26 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
| 27 | PREFERRED_VERSION_linux-yocto ?= "5.15%" | 27 | PREFERRED_VERSION_linux-yocto ?= "6.1%" |
| 28 | 28 | ||
| 29 | KERNEL_IMAGETYPE = "zImage" | 29 | KERNEL_IMAGETYPE = "zImage" |
| 30 | KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" | 30 | 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" | |||
| 11 | KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment" | 11 | KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment" |
| 12 | 12 | ||
| 13 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 13 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
| 14 | PREFERRED_VERSION_linux-yocto ?= "5.15%" | 14 | PREFERRED_VERSION_linux-yocto ?= "6.1%" |
| 15 | 15 | ||
| 16 | SERIAL_CONSOLES = "115200;ttyS0" | 16 | SERIAL_CONSOLES = "115200;ttyS0" |
| 17 | USE_VT ?= "0" | 17 | 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 | |||
| 2 | require conf/machine/include/x86/qemuboot-x86.inc | 2 | require conf/machine/include/x86/qemuboot-x86.inc |
| 3 | MACHINE_FEATURES += "wifi efi pcbios" | 3 | MACHINE_FEATURES += "wifi efi pcbios" |
| 4 | 4 | ||
| 5 | PREFERRED_VERSION_linux-yocto ?= "5.15%" | 5 | PREFERRED_VERSION_linux-yocto ?= "6.1%" |
| 6 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 6 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
| 7 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | 7 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
| 8 | XSERVER ?= "${XSERVER_X86_BASE} \ | 8 | XSERVER ?= "${XSERVER_X86_BASE} \ |