diff options
| author |   Tom Rini <trini@konsulko.com> | 2018-04-05 16:46:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-04-05 16:46:46 -0400 |
| commit | b749653a10ca1b360bda597f9feda3eabac7ca2a (patch) | |
| tree | 070cf15e9b8c67329992257ac96a855d055966e2 /meta-agl-bsp/conf | |
| parent | ea5a7ede18cd8e7969e998a2bcc83a190ff393bf (diff) | |
Rework how we pass arguments to QEMU, provide a wks.in file
- The official hook for changing the resolution we tell QEMU is
UVESA_MODE so change agl_qemux86-64.inc to set the value there rather
than override the whole of QB_KERNEL_CMDLINE_APPEND.
- Make agl_qemux86-64.inc further append what's needed to
QB_KERNEL_CMDLINE_APPEND as APPEND isn't used in the filesystem images
we create anymore.
- Create a directdisk.wks.in file that will (a) use --use-uuid and not
force /boot to be looked for on /dev/sda1 (when it will _NOT_ be) and
(b) evaluate QB_KERNEL_CMDLINE_APPEND to determine what the bootargs
to the kernel will be.
Change-Id: I49894d70e6c0010e0907b72f19fcc8fb0917e34a
Bug-AGL: SPEC-1301
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'meta-agl-bsp/conf')
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_qemux86-64.inc | 13 |
1 files changed, 8 insertions, 5 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" |