diff options
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/machine/include/qemuboot-mips.inc | 3 | ||||
-rw-r--r-- | meta/conf/machine/include/qemuboot-x86.inc | 3 | ||||
-rw-r--r-- | meta/conf/machine/qemuarm.conf | 3 | ||||
-rw-r--r-- | meta/conf/machine/qemuarm64.conf | 4 | ||||
-rw-r--r-- | meta/conf/machine/qemuppc.conf | 3 |
5 files changed, 11 insertions, 5 deletions
diff --git a/meta/conf/machine/include/qemuboot-mips.inc b/meta/conf/machine/include/qemuboot-mips.inc index 7d9fa52da6..75bb98861f 100644 --- a/meta/conf/machine/include/qemuboot-mips.inc +++ b/meta/conf/machine/include/qemuboot-mips.inc | |||
@@ -3,6 +3,7 @@ IMAGE_CLASSES += "qemuboot" | |||
3 | QB_MEM = "-m 256" | 3 | 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 | QB_OPT_APPEND = "-vga cirrus -show-cursor -usb -device usb-tablet" | ||
6 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 7 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
7 | QB_OPT_APPEND = "-vga cirrus -show-cursor -usb -device usb-tablet -device virtio-rng-pci" | 8 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" |
8 | QB_SYSTEM_NAME = "qemu-system-${TUNE_ARCH}" | 9 | 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 1456bf7e8b..5fdbe4df50 100644 --- a/meta/conf/machine/include/qemuboot-x86.inc +++ b/meta/conf/machine/include/qemuboot-x86.inc | |||
@@ -11,7 +11,8 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo" | |||
11 | QB_AUDIO_DRV = "alsa" | 11 | 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 | QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet" | ||
14 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 15 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
15 | QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet -device virtio-rng-pci" | 16 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" |
16 | 17 | ||
17 | UVESA_MODE ?= "640x480-32" | 18 | UVESA_MODE ?= "640x480-32" |
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index d2f2c85c3f..a544312627 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf | |||
@@ -14,7 +14,8 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1" | |||
14 | QB_SYSTEM_NAME = "qemu-system-arm" | 14 | 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 | QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" | ||
17 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 18 | # 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" | 19 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" |
19 | PREFERRED_VERSION_linux-yocto ??= "4.18%" | 20 | 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)}" | 21 | QB_DTB = "${@oe.utils.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 242889ac8a..34fcd2aed0 100644 --- a/meta/conf/machine/qemuarm64.conf +++ b/meta/conf/machine/qemuarm64.conf | |||
@@ -16,7 +16,9 @@ QB_MACHINE = "-machine virt" | |||
16 | QB_CPU = "-cpu cortex-a57" | 16 | QB_CPU = "-cpu cortex-a57" |
17 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,38400" | 17 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,38400" |
18 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 18 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
19 | QB_OPT_APPEND = "-show-cursor -device virtio-rng-pci -monitor null" | 19 | QB_OPT_APPEND = "-show-cursor -monitor null" |
20 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | ||
21 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" | ||
20 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" | 22 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" |
21 | QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@" | 23 | QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@" |
22 | QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0" | 24 | QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0" |
diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf index 537b2f6774..743d26170e 100644 --- a/meta/conf/machine/qemuppc.conf +++ b/meta/conf/machine/qemuppc.conf | |||
@@ -16,6 +16,7 @@ QB_SYSTEM_NAME = "qemu-system-ppc" | |||
16 | QB_MACHINE = "-machine mac99" | 16 | 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 | QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" | ||
19 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 20 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
20 | QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet -device virtio-rng-pci" | 21 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" |
21 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" | 22 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" |