aboutsummaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp/wic
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-11-27 08:13:50 -0500
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-12-10 12:30:41 +0000
commit1c86be5ca1bf1d6fe2b92d2282df61f48bf9edb6 (patch)
tree9af5cfb7abde8e64c4912d514f732a54a9673606 /meta-agl-bsp/wic
parent12961ea31e01a8af971f83bc61d3f36673993121 (diff)
meta-intel: Switch to using WIC images only
The hddimg format has a hard-stop at 4GB sized images. We can trigger this rather easily at this point under agl-demo-platform-crosssdk. WIC images do not have any such limitation, so we remove hddimg from the list of built images. The main impact of this is that whereas before we would modify the default kernel command line via APPEND in the conf file we would now modify it via the wks file we create for each platform and that mkefi-agl.sh is now redundant. These wks files are based on the systemd one but also reflect the design of mkefi-agl.sh in that they drop the swap partition. Much of the APPEND commentary is moved to the wks file and we remove some irrelevant comments as well. Bug-AGL: SPEC-963 Change-Id: If667e1f946e4b9793b63f6d7f572d56d73e35767 Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/12159 ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Diffstat (limited to 'meta-agl-bsp/wic')
-rw-r--r--meta-agl-bsp/wic/systemd-intel-corei7-64-bootdisk.wks23
-rw-r--r--meta-agl-bsp/wic/systemd-joule-bootdisk.wks12
2 files changed, 35 insertions, 0 deletions
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"