diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2018-04-10 14:25:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2018-04-10 14:25:08 +0000 |
| commit | 93c3f85bd8b1313f9cc4cdaf1cd4bd6d9dbdc91e (patch) | |
| tree | 7a22954a1c3a45545a2f6bd53dd54a3354d4c8ff | |
| parent | 6df5650548d5a3ce4eff22f2a548ce921d2c3319 (diff) | |
| parent | b749653a10ca1b360bda597f9feda3eabac7ca2a (diff) | |
Merge "Rework how we pass arguments to QEMU, provide a wks.in file"
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_qemux86-64.inc | 13 | ||||
| -rw-r--r-- | meta-agl-bsp/wic/directdisk.wks.in | 9 | ||||
| -rw-r--r-- | meta-agl-distro/conf/distro/include/x86_64-tune.inc | 1 |
3 files changed, 17 insertions, 6 deletions
diff --git a/meta-agl-bsp/conf/include/agl_qemux86-64.inc b/meta-agl-bsp/conf/include/agl_qemux86-64.inc index 165deae41..1fe839d68 100644 --- a/meta-agl-bsp/conf/include/agl_qemux86-64.inc +++ b/meta-agl-bsp/conf/include/agl_qemux86-64.inc @@ -3,19 +3,19 @@ # To get wide screen than default, there are a selection of resolutions # available: # -#APPEND += "uvesafb.mode_option=1024x768-32" -APPEND += "uvesafb.mode_option=1280x1024-32" -#APPEND += "uvesafb.mode_option=1600x1200-32" +#UVESA_MODE = "1024x768-32" +UVESA_MODE = "1280x1024-32" +#UVESA_MODE = "1600x1200-32" # # To avoid corrupt boot screen by systemd message, you can use serial # console separated from VGA console or disable all boot messages by # kernel command line. # # Configuration for serial console -APPEND += "console=ttyS0,115200n8" +QB_KERNEL_CMDLINE_APPEND_append = " console=ttyS0,115200n8" # # All boot message will be off -APPEND += "quiet" +QB_KERNEL_CMDLINE_APPEND_append = " quiet" # Build updatable image. Only takes effect when sota.bbclass is inherited DISTRO_FEATURES_append = " sota" @@ -29,3 +29,6 @@ ROOT_VM = "root=PARTUUID=${DISK_SIGNATURE}-02" # Force the virtio video device as 'vmware' doesn't always work QB_OPT_APPEND_append = " -vga virtio" + +# Use our own wks file +WKS_FILE="directdisk.wks.in" diff --git a/meta-agl-bsp/wic/directdisk.wks.in b/meta-agl-bsp/wic/directdisk.wks.in new file mode 100644 index 000000000..f7b220cdb --- /dev/null +++ b/meta-agl-bsp/wic/directdisk.wks.in @@ -0,0 +1,9 @@ +# short-description: Create a 'pcbios' direct disk image +# long-description: Creates a partitioned legacy BIOS disk image that the user +# can directly dd to boot media. + +part /boot --source bootimg-pcbios --use-uuid --label boot --active --align 1024 +part / --source rootfs --use-uuid --fstype=ext4 --label platform --align 1024 + +bootloader --timeout=0 --append="rootwait rootfstype=ext4 ${QB_KERNEL_CMDLINE_APPEND}" + diff --git a/meta-agl-distro/conf/distro/include/x86_64-tune.inc b/meta-agl-distro/conf/distro/include/x86_64-tune.inc index f3bfc372f..2efeca04d 100644 --- a/meta-agl-distro/conf/distro/include/x86_64-tune.inc +++ b/meta-agl-distro/conf/distro/include/x86_64-tune.inc @@ -51,6 +51,5 @@ QB_SYSTEM_NAME_x86-64 = "qemu-system-x86_64" QB_CPU_x86-64 = "-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt" QB_CPU_KVM_x86-64 = "-cpu kvm64 -cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt" -QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=1024x768-32 oprofile.timer=1 uvesafb.task_timeout=-1" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci" |