From 7ecdf7ac6384ccd6d09fb399bf3a781b05cfb865 Mon Sep 17 00:00:00 2001 From: Kevin Hao Date: Wed, 26 Aug 2020 14:13:30 +0800 Subject: meta-yocto-bsp: Bump to the v5.8 kernel Boot test for all the supported boards. There is a kernel config check warning for beaglebone-yocto, the fix [1] has been sent to kernel-meta for merging. [1] https://lists.yoctoproject.org/g/linux-yocto/message/8992 (From meta-yocto rev: ccc825335f257ca2259440c561eea02538edd762) Signed-off-by: Kevin Hao Signed-off-by: Richard Purdie --- meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | 2 +- meta-yocto-bsp/conf/machine/edgerouter.conf | 2 +- .../recipes-kernel/linux/linux-yocto_5.8.bbappend | 23 ++++++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.8.bbappend diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index 5b481434bd..b7defb0d01 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.4%" +PREFERRED_VERSION_linux-yocto ?= "5.8%" 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 d6fd934fa5..75bc5e5f28 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.4%" +PREFERRED_VERSION_linux-yocto ?= "5.8%" SERIAL_CONSOLES = "115200;ttyS0" USE_VT ?= "0" diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.8.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.8.bbappend new file mode 100644 index 0000000000..5d844423af --- /dev/null +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.8.bbappend @@ -0,0 +1,23 @@ +KBRANCH_genericx86 = "v5.8/standard/base" +KBRANCH_genericx86-64 = "v5.8/standard/base" +KBRANCH_edgerouter = "v5.8/standard/edgerouter" +KBRANCH_beaglebone-yocto = "v5.8/standard/beaglebone" + +KMACHINE_genericx86 ?= "common-pc" +KMACHINE_genericx86-64 ?= "common-pc-64" +KMACHINE_beaglebone-yocto ?= "beaglebone" + +SRCREV_machine_genericx86 ?= "912adf166eb0688e011154048f5fa0e5863249c3" +SRCREV_machine_genericx86-64 ?= "912adf166eb0688e011154048f5fa0e5863249c3" +SRCREV_machine_edgerouter ?= "912adf166eb0688e011154048f5fa0e5863249c3" +SRCREV_machine_beaglebone-yocto ?= "912adf166eb0688e011154048f5fa0e5863249c3" + +COMPATIBLE_MACHINE_genericx86 = "genericx86" +COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" +COMPATIBLE_MACHINE_edgerouter = "edgerouter" +COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" + +LINUX_VERSION_genericx86 = "5.8.2" +LINUX_VERSION_genericx86-64 = "5.8.2" +LINUX_VERSION_edgerouter = "5.8.2" +LINUX_VERSION_beaglebone-yocto = "5.8.2" -- cgit v1.2.3-54-g00ecf