summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-08-21 15:02:14 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-25 01:00:37 +0100
commit133accd3dfb6ea55e79585c2781d3fc062c44d32 (patch)
tree81c3a01ec7e1f821754cdcc8adac926e601fb25c
parent36b3acaea708ecfaf4ac05444e9d9087b795ff28 (diff)
downloadpoky-133accd3dfb6ea55e79585c2781d3fc062c44d32.tar.gz
qemu: bump default reference kernel to v5.8
Now that the 5.8 recipes are available, we bump the default versions to use them. (From OE-Core rev: 61b7d0c61b5fce319a8a1fc2c4ff38299d41202e) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/machine/include/x86-base.inc2
-rw-r--r--meta/conf/machine/qemuarmv5.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/machine/include/x86-base.inc b/meta/conf/machine/include/x86-base.inc
index a72714711d..a3169b7405 100644
--- a/meta/conf/machine/include/x86-base.inc
+++ b/meta/conf/machine/include/x86-base.inc
@@ -18,7 +18,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0"
18# kernel-related variables 18# kernel-related variables
19# 19#
20PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" 20PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto"
21PREFERRED_VERSION_linux-yocto ??= "5.4%" 21PREFERRED_VERSION_linux-yocto ??= "5.8%"
22 22
23# 23#
24# XSERVER subcomponents, used to build the XSERVER variable 24# XSERVER subcomponents, used to build the XSERVER variable
diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf
index 6940efe46f..48e83f13e1 100644
--- a/meta/conf/machine/qemuarmv5.conf
+++ b/meta/conf/machine/qemuarmv5.conf
@@ -16,7 +16,7 @@ QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty"
16QB_OPT_APPEND = "-usb -device usb-tablet" 16QB_OPT_APPEND = "-usb -device usb-tablet"
17# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy 17# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
18QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" 18QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
19PREFERRED_VERSION_linux-yocto ??= "5.4%" 19PREFERRED_VERSION_linux-yocto ??= "5.8%"
20QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" 20QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}"
21 21
22KMACHINE_qemuarmv5 = "qemuarm" 22KMACHINE_qemuarmv5 = "qemuarm"