From 46e0391f611f6686ef3362b32f493ae74ec15d43 Mon Sep 17 00:00:00 2001 From: Kevin Hao Date: Wed, 12 Feb 2020 11:45:02 +0800 Subject: meta-yocto-bsp: Bump to the v5.4 kernel for the non-x86 boards Build and boot test for the beaglebone and edgerouter. (From meta-yocto rev: db4247b8c95ec997fa90226a49df36d7366c469f) 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.4.bbappend | 13 +++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.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 08dd3a5074..5b481434bd 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.2%" +PREFERRED_VERSION_linux-yocto ?= "5.4%" 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 6331368f87..d6fd934fa5 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.2%" +PREFERRED_VERSION_linux-yocto ?= "5.4%" SERIAL_CONSOLES = "115200;ttyS0" USE_VT ?= "0" diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend new file mode 100644 index 0000000000..fdcf8a7772 --- /dev/null +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend @@ -0,0 +1,13 @@ +KBRANCH_edgerouter = "v5.4/standard/edgerouter" +KBRANCH_beaglebone-yocto = "v5.4/standard/beaglebone" + +KMACHINE_beaglebone-yocto ?= "beaglebone" + +SRCREV_machine_edgerouter ?= "cdda35317561d2741b396efa623ace0bd2212c16" +SRCREV_machine_beaglebone-yocto ?= "cdda35317561d2741b396efa623ace0bd2212c16" + +COMPATIBLE_MACHINE_edgerouter = "edgerouter" +COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" + +LINUX_VERSION_edgerouter = "5.4.15" +LINUX_VERSION_beaglebone-yocto = "5.4.15" -- cgit v1.2.3-54-g00ecf