diff options
| author | Jon Mason <jdmason@kudzu.us> | 2021-03-10 18:05:31 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-11 14:00:36 +0000 |
| commit | bd0ada8994ce3c1cb3a2d67dc9e8fae5c348118e (patch) | |
| tree | e3f52e31bf30818df860e7d020b2e650bb1b1790 /meta/conf | |
| parent | f4adaac783671def758dcccb8e2533f47e1daf3a (diff) | |
| download | poky-bd0ada8994ce3c1cb3a2d67dc9e8fae5c348118e.tar.gz | |
runqemu: add QB_GRAPHICS
Add a new runqemu field for VGA devices. Currently, these are being set
in QB_OPT_APPEND, which can make them difficult to override if importing
the config file into another one.
(From OE-Core rev: 695c98b6522be4373806c154a2999eaeef205556)
Signed-off-by: Jon Mason <jon.mason@arm.com>
Change-Id: I8cb9527954c5b06c083c42fe2466cb3338584b7d
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/machine/include/qemuboot-mips.inc | 2 | ||||
| -rw-r--r-- | meta/conf/machine/qemuarm.conf | 4 | ||||
| -rw-r--r-- | meta/conf/machine/qemuarm64.conf | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/meta/conf/machine/include/qemuboot-mips.inc b/meta/conf/machine/include/qemuboot-mips.inc index 230f032c53..4954f3068c 100644 --- a/meta/conf/machine/include/qemuboot-mips.inc +++ b/meta/conf/machine/include/qemuboot-mips.inc | |||
| @@ -5,4 +5,4 @@ QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" | |||
| 5 | QB_OPT_APPEND = "-usb -device usb-tablet" | 5 | QB_OPT_APPEND = "-usb -device usb-tablet" |
| 6 | 6 | ||
| 7 | # For graphics to work we need to define the VGA device as well as the necessary USB devices | 7 | # For graphics to work we need to define the VGA device as well as the necessary USB devices |
| 8 | QB_OPT_APPEND += "-vga std" | 8 | QB_GRAPHICS = "-vga std" |
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 257cfa3e63..37dae8c863 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf | |||
| @@ -19,8 +19,8 @@ QB_CPU = "-cpu cortex-a15" | |||
| 19 | # Standard Serial console | 19 | # Standard Serial console |
| 20 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0 vmalloc=256" | 20 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0 vmalloc=256" |
| 21 | # For graphics to work we need to define the VGA device as well as the necessary USB devices | 21 | # For graphics to work we need to define the VGA device as well as the necessary USB devices |
| 22 | QB_OPT_APPEND = "-device VGA,edid=on" | 22 | QB_GRAPHICS = "-device VGA,edid=on" |
| 23 | QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd" | 23 | QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" |
| 24 | # Virtio Networking support | 24 | # Virtio Networking support |
| 25 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" | 25 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" |
| 26 | QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@" | 26 | QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@" |
diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf index 2f61eb0aed..05fd1f749b 100644 --- a/meta/conf/machine/qemuarm64.conf +++ b/meta/conf/machine/qemuarm64.conf | |||
| @@ -20,8 +20,8 @@ QB_CPU_KVM = "-cpu host -machine gic-version=3" | |||
| 20 | # Standard Serial console | 20 | # Standard Serial console |
| 21 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0" | 21 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0" |
| 22 | # For graphics to work we need to define the VGA device as well as the necessary USB devices | 22 | # For graphics to work we need to define the VGA device as well as the necessary USB devices |
| 23 | QB_OPT_APPEND = "-device VGA,edid=on" | 23 | QB_GRAPHICS = "-device VGA,edid=on" |
| 24 | QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd" | 24 | QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" |
| 25 | # Virtio Networking support | 25 | # Virtio Networking support |
| 26 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" | 26 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" |
| 27 | QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@" | 27 | QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@" |