aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJianxun Zhang <jianxun.zhang@linux.intel.com>2016-07-26 15:26:16 -0700
committerTom Zanussi <tom.zanussi@linux.intel.com>2016-07-28 12:09:21 -0500
commit7d00922e1cd3caabb8046e68a6107b9f4f3f1d34 (patch)
tree5b7628093d0e44769e4c4b1e88f9d925f47584bf
parenta4c1cfb53d192036597a7926d3fba4105076c1ea (diff)
downloadmeta-intel-7d00922e1cd3caabb8046e68a6107b9f4f3f1d34.tar.gz
meta-intel-7d00922e1cd3caabb8046e68a6107b9f4f3f1d34.tar.bz2
meta-intel-7d00922e1cd3caabb8046e68a6107b9f4f3f1d34.zip
quark: Switch gummiboot to systemd-boot
The systemd-boot is the old gummiboot merged into systemd project. We have enabled systemd-boot as a standalone EFI bootloader in OE, also with updated wic plugin to support specifying "systemd-boot" as bootloader in wks files. Assuming these are good enough to replace gummiboot for quark, this change does it. Signed-off-by: Jianxun Zhang <jianxun.zhang@linux.intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
-rw-r--r--conf/machine/intel-quark.conf2
-rw-r--r--scripts/lib/wic/canned-wks/mkgalileodisk.wks2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/intel-quark.conf b/conf/machine/intel-quark.conf
index 68e11993..ad673198 100644
--- a/conf/machine/intel-quark.conf
+++ b/conf/machine/intel-quark.conf
@@ -18,7 +18,7 @@ MACHINE_EXTRA_RRECOMMENDS += "kernel-modules linux-firmware"
SERIAL_CONSOLE = "115200 ttyS1"
APPEND += "rootwait console=ttyS1,115200 console=tty0"
-EFI_PROVIDER = "gummiboot"
+EFI_PROVIDER = "systemd-boot"
# Ensure that the Lock prefix is omitted for the kernel"
KERNEL_EXTRA_ARGS = "EXTRA_CFLAGS=-Wa,-momit-lock-prefix=yes"
diff --git a/scripts/lib/wic/canned-wks/mkgalileodisk.wks b/scripts/lib/wic/canned-wks/mkgalileodisk.wks
index e587e293..c9835a65 100644
--- a/scripts/lib/wic/canned-wks/mkgalileodisk.wks
+++ b/scripts/lib/wic/canned-wks/mkgalileodisk.wks
@@ -2,7 +2,7 @@
# long-description: Creates a partitioned EFI disk image for Intel Galileo Gen 1/2,
# that the user can directly dd to boot media.
-part /boot --source bootimg-efi --sourceparams="loader=gummiboot" --ondisk mmcblk0 --label msdos --active --align 1024
+part /boot --source bootimg-efi --sourceparams="loader=systemd-boot" --ondisk mmcblk0 --label msdos --active --align 1024
part / --source rootfs --ondisk mmcblk0 --fstype=ext3 --label platform --align 1024