diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-08-24 10:59:59 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-28 10:30:28 +0100 |
commit | ec71111c9c5b438d3f2455968e32b47551ddc62d (patch) | |
tree | 613f88997d8371ffb0805206203d3d1bfd8728bf /meta/conf/machine/qemuarm.conf | |
parent | 8a8382ecce89b153b2d3238bd9b173bb1778b9cc (diff) | |
download | poky-ec71111c9c5b438d3f2455968e32b47551ddc62d.tar.gz |
qemu/bsp: update 4.15 preferred versions to 4.18
4.18 is replacing 4.15 as the latest kernel in the upcoming
release, so we update our preferred versions to match.
(From OE-Core rev: e12f9e7ede7eea408d6a97233c7c8df97e8bfb26)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine/qemuarm.conf')
-rw-r--r-- | meta/conf/machine/qemuarm.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 9403b1e7e3..d2f2c85c3f 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf | |||
@@ -16,5 +16,5 @@ QB_MACHINE = "-machine versatilepb" | |||
16 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" | 16 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" |
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 |
18 | QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet -device virtio-rng-pci" | 18 | QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet -device virtio-rng-pci" |
19 | PREFERRED_VERSION_linux-yocto ??= "4.15%" | 19 | PREFERRED_VERSION_linux-yocto ??= "4.18%" |
20 | QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" | 20 | QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" |