diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2017-08-18 18:19:14 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-19 22:15:39 +0100 |
| commit | f6857d9832a799f39e1c9d6b09fbb7c76fca88da (patch) | |
| tree | c567bfc5bf0357b612ddeb831ead7abc33b31941 /meta/conf/machine | |
| parent | 045e3f9283b879f0a09a1512ec509b0c86948b45 (diff) | |
| download | poky-f6857d9832a799f39e1c9d6b09fbb7c76fca88da.tar.gz | |
qemu conf: replace deprecated option with new option
Replace the deprecated '-usbdevice' option with '-device usb-xx' option.
This would fix runqemu boot error like below.
'-usbdevice' is deprecated, please use '-device usb-...' instead
(From OE-Core rev: 2f1f3480d344f8521e01f456d2dcd6c4e989ec59)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
| -rw-r--r-- | meta/conf/machine/include/qemuboot-mips.inc | 2 | ||||
| -rw-r--r-- | meta/conf/machine/include/qemuboot-x86.inc | 2 | ||||
| -rw-r--r-- | meta/conf/machine/qemuarm.conf | 2 | ||||
| -rw-r--r-- | meta/conf/machine/qemuppc.conf | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/meta/conf/machine/include/qemuboot-mips.inc b/meta/conf/machine/include/qemuboot-mips.inc index 0c60cf297f..7d9fa52da6 100644 --- a/meta/conf/machine/include/qemuboot-mips.inc +++ b/meta/conf/machine/include/qemuboot-mips.inc | |||
| @@ -4,5 +4,5 @@ QB_MEM = "-m 256" | |||
| 4 | QB_MACHINE = "-machine malta" | 4 | QB_MACHINE = "-machine malta" |
| 5 | QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" | 5 | QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" |
| 6 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 6 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
| 7 | QB_OPT_APPEND = "-vga cirrus -show-cursor -usb -usbdevice tablet -device virtio-rng-pci" | 7 | QB_OPT_APPEND = "-vga cirrus -show-cursor -usb -device usb-tablet -device virtio-rng-pci" |
| 8 | QB_SYSTEM_NAME = "qemu-system-${TUNE_ARCH}" | 8 | QB_SYSTEM_NAME = "qemu-system-${TUNE_ARCH}" |
diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc index acf9d55c40..0596e2ed3f 100644 --- a/meta/conf/machine/include/qemuboot-x86.inc +++ b/meta/conf/machine/include/qemuboot-x86.inc | |||
| @@ -12,7 +12,7 @@ QB_AUDIO_DRV = "alsa" | |||
| 12 | QB_AUDIO_OPT = "-soundhw ac97,es1370" | 12 | QB_AUDIO_OPT = "-soundhw ac97,es1370" |
| 13 | QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1" | 13 | QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1" |
| 14 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 14 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
| 15 | QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci" | 15 | QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet -device virtio-rng-pci" |
| 16 | 16 | ||
| 17 | KERNEL_MODULE_AUTOLOAD += "uvesafb" | 17 | KERNEL_MODULE_AUTOLOAD += "uvesafb" |
| 18 | KERNEL_MODULE_PROBECONF += "uvesafb" | 18 | KERNEL_MODULE_PROBECONF += "uvesafb" |
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 6b875e415c..1f0a65f291 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf | |||
| @@ -15,6 +15,6 @@ QB_SYSTEM_NAME = "qemu-system-arm" | |||
| 15 | QB_MACHINE = "-machine versatilepb" | 15 | 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 -usbdevice 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.10%" | 19 | PREFERRED_VERSION_linux-yocto ??= "4.10%" |
| 20 | QB_DTB = "${@base_version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" | 20 | QB_DTB = "${@base_version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" |
diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf index a9ef64b0af..537b2f6774 100644 --- a/meta/conf/machine/qemuppc.conf +++ b/meta/conf/machine/qemuppc.conf | |||
| @@ -17,5 +17,5 @@ QB_MACHINE = "-machine mac99" | |||
| 17 | QB_CPU = "-cpu G4" | 17 | QB_CPU = "-cpu G4" |
| 18 | QB_KERNEL_CMDLINE_APPEND = "console=tty console=ttyS0" | 18 | QB_KERNEL_CMDLINE_APPEND = "console=tty console=ttyS0" |
| 19 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 19 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
| 20 | QB_OPT_APPEND = "-show-cursor -usb -usbdevice tablet -device virtio-rng-pci" | 20 | QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet -device virtio-rng-pci" |
| 21 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" | 21 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" |