summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/machine/include/qemuboot-mips.inc1
-rw-r--r--meta/conf/machine/include/qemuboot-x86.inc1
-rw-r--r--meta/conf/machine/qemuarm.conf1
-rw-r--r--meta/conf/machine/qemuarm64.conf1
-rw-r--r--meta/conf/machine/qemuppc.conf1
5 files changed, 5 insertions, 0 deletions
diff --git a/meta/conf/machine/include/qemuboot-mips.inc b/meta/conf/machine/include/qemuboot-mips.inc
index 01f8f8bb3b..0c60cf297f 100644
--- a/meta/conf/machine/include/qemuboot-mips.inc
+++ b/meta/conf/machine/include/qemuboot-mips.inc
@@ -3,5 +3,6 @@ IMAGE_CLASSES += "qemuboot"
3QB_MEM = "-m 256" 3QB_MEM = "-m 256"
4QB_MACHINE = "-machine malta" 4QB_MACHINE = "-machine malta"
5QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" 5QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty"
6# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
6QB_OPT_APPEND = "-vga cirrus -show-cursor -usb -usbdevice tablet -device virtio-rng-pci" 7QB_OPT_APPEND = "-vga cirrus -show-cursor -usb -usbdevice tablet -device virtio-rng-pci"
7QB_SYSTEM_NAME = "qemu-system-${TUNE_ARCH}" 8QB_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 20e90716db..06ac983d4d 100644
--- a/meta/conf/machine/include/qemuboot-x86.inc
+++ b/meta/conf/machine/include/qemuboot-x86.inc
@@ -11,4 +11,5 @@ QB_CPU_KVM_x86-64 = "-cpu kvm64"
11QB_AUDIO_DRV = "alsa" 11QB_AUDIO_DRV = "alsa"
12QB_AUDIO_OPT = "-soundhw ac97,es1370" 12QB_AUDIO_OPT = "-soundhw ac97,es1370"
13QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=640x480-32 oprofile.timer=1 uvesafb.task_timeout=-1" 13QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=640x480-32 oprofile.timer=1 uvesafb.task_timeout=-1"
14# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
14QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci" 15QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci"
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index ff1ab7d48f..17402ef3b3 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -14,6 +14,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0 115200;ttyAMA1"
14QB_SYSTEM_NAME = "qemu-system-arm" 14QB_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"
17# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
17QB_OPT_APPEND = "-show-cursor -usb -usbdevice tablet -device virtio-rng-pci" 18QB_OPT_APPEND = "-show-cursor -usb -usbdevice tablet -device virtio-rng-pci"
18PREFERRED_VERSION_linux-yocto ??= "4.8%" 19PREFERRED_VERSION_linux-yocto ??= "4.8%"
19QB_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)}"
diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf
index a0920fe0e4..d0750624a8 100644
--- a/meta/conf/machine/qemuarm64.conf
+++ b/meta/conf/machine/qemuarm64.conf
@@ -15,6 +15,7 @@ QB_MEM = "-m 512"
15QB_MACHINE = "-machine virt" 15QB_MACHINE = "-machine virt"
16QB_CPU = "-cpu cortex-a57" 16QB_CPU = "-cpu cortex-a57"
17QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,38400" 17QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,38400"
18# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
18QB_OPT_APPEND = "-show-cursor -device virtio-rng-pci" 19QB_OPT_APPEND = "-show-cursor -device virtio-rng-pci"
19QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -device virtio-net-device,netdev=net0,mac=@MAC@" 20QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -device virtio-net-device,netdev=net0,mac=@MAC@"
20QB_SLIRP_OPT = "-netdev user,id=net0 -device virtio-net-device,netdev=net0" 21QB_SLIRP_OPT = "-netdev user,id=net0 -device virtio-net-device,netdev=net0"
diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf
index 3ae33088ea..8703c2086a 100644
--- a/meta/conf/machine/qemuppc.conf
+++ b/meta/conf/machine/qemuppc.conf
@@ -16,5 +16,6 @@ QB_SYSTEM_NAME = "qemu-system-ppc"
16QB_MACHINE = "-machine mac99" 16QB_MACHINE = "-machine mac99"
17QB_CPU = "-cpu G4" 17QB_CPU = "-cpu G4"
18QB_KERNEL_CMDLINE_APPEND = "console=tty console=ttyS0" 18QB_KERNEL_CMDLINE_APPEND = "console=tty console=ttyS0"
19# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
19QB_OPT_APPEND = "-show-cursor -usb -usbdevice tablet -device virtio-rng-pci" 20QB_OPT_APPEND = "-show-cursor -usb -usbdevice tablet -device virtio-rng-pci"
20QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -device virtio-net-pci,netdev=net0,mac=@MAC@" 21QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -device virtio-net-pci,netdev=net0,mac=@MAC@"