summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-09-05 23:15:05 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-09 12:07:31 +0100
commit8b6e7729a3c5c6952a88d1a0c9e32a5a01e8dc46 (patch)
tree0691ae6c085b14c085afe0422b6c3aa676e0366a
parent9b7614e674ad4f6e7312d0599ca8ce94c7b50d81 (diff)
downloadpoky-8b6e7729a3c5c6952a88d1a0c9e32a5a01e8dc46.tar.gz
qemuarm.conf: set PREFERRED_VERSION_linux-yocto
The base_version_less_or_equal() will raise errors if PREFERRED_VERSION_linux-yocto is None. For example, when we build DISTRO = "nodistro", PREFERRED_VERSION_linux-yocto is not be defined since it is defined in poky.conf, and then bitbake will choose the higher version which is 4.8 currently, so set PREFERRED_VERSION_linux-yocto to 4.8, otherwise, runqemu can't boot it. (From OE-Core rev: fd31e30f97ee9bd128d5b7b748987b0a6427b279) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/machine/qemuarm.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 3ca4d6e462..4c5891ab7c 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -15,4 +15,5 @@ QB_SYSTEM_NAME = "qemu-system-arm"
15QB_MACHINE = "-machine versatilepb" 15QB_MACHINE = "-machine versatilepb"
16QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" 16QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty"
17QB_OPT_APPEND = "-show-cursor -usb -usbdevice tablet" 17QB_OPT_APPEND = "-show-cursor -usb -usbdevice tablet"
18PREFERRED_VERSION_linux-yocto ??= "4.8%"
18QB_DTB = "${@base_version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" 19QB_DTB = "${@base_version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}"