diff options
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_intel-corei7-64.inc | 26 | ||||
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_joule.inc | 8 | ||||
| -rw-r--r-- | meta-agl-bsp/wic/systemd-intel-corei7-64-bootdisk.wks | 23 | ||||
| -rw-r--r-- | meta-agl-bsp/wic/systemd-joule-bootdisk.wks | 12 |
4 files changed, 44 insertions, 25 deletions
diff --git a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc index 36d6f4723..cc181ddaa 100644 --- a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc +++ b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc @@ -1,22 +1,3 @@ -# Configurations to run on VirtualBox/VMWare -# -# 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" -# -# 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 reboot=efi" -# -# All boot message will be off -#APPEND += "quiet" - # Enable Libvaapi for HW accelerated video support # IMAGE_INSTALL_append = " \ @@ -24,6 +5,9 @@ IMAGE_INSTALL_append = " \ va-intel \ gstreamer1.0-vaapi" -AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum hddimg" +AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum" INITRD_LIVE = "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.ext4.gz" -NOISO = "1" + +# Modify this file under meta-agl-bsp/meta-intel/wic to change the +# kernel command line, including to change the screen resolution. +WKS_FILE = "systemd-intel-corei7-64-bootdisk.wks" diff --git a/meta-agl-bsp/conf/include/agl_joule.inc b/meta-agl-bsp/conf/include/agl_joule.inc index 310b08979..d29563481 100644 --- a/meta-agl-bsp/conf/include/agl_joule.inc +++ b/meta-agl-bsp/conf/include/agl_joule.inc @@ -1,7 +1,5 @@ INTEL_MACHINE_SUBTYPE = "broxton-m" -APPEND += "console=ttyS2,115200n8 video=efifb maxcpus=4 noxsave reboot=efi kmemleak=off" - IMAGE_INSTALL_append = " linux-firmware-iwlwifi-8000c linux-firmware-ibt-11-5" IMAGE_INSTALL_append = " \ libva \ @@ -9,6 +7,8 @@ IMAGE_INSTALL_append = " \ gstreamer1.0-vaapi" OSTREE_BOOTLOADER ?= "u-boot" -AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum hddimg" +AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum" INITRD_LIVE = "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.ext4.gz" -NOISO = "1" +# Modify this file under meta-agl-bsp/meta-intel/wic to change the +# kernel command line +WKS_FILE = "systemd-joule-bootdisk.wks" diff --git a/meta-agl-bsp/wic/systemd-intel-corei7-64-bootdisk.wks b/meta-agl-bsp/wic/systemd-intel-corei7-64-bootdisk.wks new file mode 100644 index 000000000..828969b89 --- /dev/null +++ b/meta-agl-bsp/wic/systemd-intel-corei7-64-bootdisk.wks @@ -0,0 +1,23 @@ +# short-description: Custom EFI disk image with systemd-boot +# long-description: Creates a partitioned EFI disk image that the user +# can directly dd to boot media. The selected bootloader is systemd-boot +# and we do not have swap + +part /boot --source bootimg-efi --sourceparams="loader=systemd-boot" --ondisk sda --label msdos --active --align 1024 + +part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid + +# Modify the append line here as needed to suit the environment. +# +# To change the default video resolution add one of the following +# resolutions: +# uvesafb.mode_option=1024x768-32 +# uvesafb.mode_option=1280x1024-32 +# uvesafb.mode_option=1600x1200-32 +# +# To avoid corrupt boot screen by systemd message you can remove the +# console=tty0 portion below or disable all boot messages by kernel command +# line. To disable all boot messages add: +# +# quiet +bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4 console=ttyS0,115200n8 console=tty0 reboot=efi" diff --git a/meta-agl-bsp/wic/systemd-joule-bootdisk.wks b/meta-agl-bsp/wic/systemd-joule-bootdisk.wks new file mode 100644 index 000000000..ab75beb84 --- /dev/null +++ b/meta-agl-bsp/wic/systemd-joule-bootdisk.wks @@ -0,0 +1,12 @@ +# short-description: Custom EFI disk image with systemd-boot +# long-description: Creates a partitioned EFI disk image that the user +# can directly dd to boot media. The selected bootloader is systemd-boot +# and we do not have swap. We assume a Joule system and provide an +# appropriate kernel command line. + +part /boot --source bootimg-efi --sourceparams="loader=systemd-boot" --ondisk sda --label msdos --active --align 1024 + +part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid + +# Modify the append line here as needed to suit the environment +bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4 console=ttyS2,115200n8 console=tty0 video=efifb maxcpus=4 noxsave reboot=efi kmemleak=off" |