summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/qemuarm.conf
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2017-08-20 22:58:20 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-23 12:06:51 +0100
commitdd370ce97b1e515a4127b7ca9d70805f4d9c6674 (patch)
tree997c9d6860865a85f0725a00f5bfcec1ad72277c /meta/conf/machine/qemuarm.conf
parentd8f57413af3ff077c524580c251088071d4ae5d6 (diff)
downloadpoky-dd370ce97b1e515a4127b7ca9d70805f4d9c6674.tar.gz
qemu: bump default version to 4.12
Not all the qemu machines carry default kernel specifications. While we could drop these references, we'll bump them to 4.12 to pick up the latest and remove them in future commits. (From OE-Core rev: c58df63d88a07d3275e7337f7d284b0a50db82cc) 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.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 1f0a65f291..c8932ddc59 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -16,5 +16,5 @@ QB_MACHINE = "-machine versatilepb"
16QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" 16QB_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
18QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet -device virtio-rng-pci" 18QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet -device virtio-rng-pci"
19PREFERRED_VERSION_linux-yocto ??= "4.10%" 19PREFERRED_VERSION_linux-yocto ??= "4.12%"
20QB_DTB = "${@base_version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" 20QB_DTB = "${@base_version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}"