From b749653a10ca1b360bda597f9feda3eabac7ca2a Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 5 Apr 2018 16:46:46 -0400 Subject: 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 --- meta-agl-bsp/conf/include/agl_qemux86-64.inc | 13 ++++++++----- meta-agl-bsp/wic/directdisk.wks.in | 9 +++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 meta-agl-bsp/wic/directdisk.wks.in (limited to 'meta-agl-bsp') 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}" + -- cgit 1.2.3-korg