diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-02-21 12:46:02 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-22 23:57:27 +0000 |
commit | 57a6948feac5585f088c23e91142d887184bd18c (patch) | |
tree | 8569b2edc388f1ee3c62c727974f39f370ebaa08 /meta/conf | |
parent | f10a4ade99a5043122b54e7f8696e96791b93a67 (diff) | |
download | poky-57a6948feac5585f088c23e91142d887184bd18c.tar.gz |
qemu: bump default reference kernel to v5.4
Now that the 5.4 recipes are available, we bump the default versions
to use them.
(From OE-Core rev: c250dbd2a68048f83837e7cbdfb53bc38623e4a2)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/machine/include/x86-base.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemuarmv5.conf | 2 |
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 da56cc3574..a72714711d 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 | # |
20 | PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" | 20 | PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" |
21 | PREFERRED_VERSION_linux-yocto ??= "5.2%" | 21 | PREFERRED_VERSION_linux-yocto ??= "5.4%" |
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 fb4789fdac..7f72048065 100644 --- a/meta/conf/machine/qemuarmv5.conf +++ b/meta/conf/machine/qemuarmv5.conf | |||
@@ -17,7 +17,7 @@ QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" | |||
17 | QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" | 17 | QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" |
18 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 18 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
19 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" | 19 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" |
20 | PREFERRED_VERSION_linux-yocto ??= "5.2%" | 20 | PREFERRED_VERSION_linux-yocto ??= "5.4%" |
21 | QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" | 21 | QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" |
22 | 22 | ||
23 | KMACHINE_qemuarmv5 = "qemuarm" | 23 | KMACHINE_qemuarmv5 = "qemuarm" |