From 15ac2f84ed67032c885e82254eda8053d601c95e Mon Sep 17 00:00:00 2001 From: Jianxun Zhang Date: Wed, 19 Oct 2016 15:07:25 -0700 Subject: quark: explicitly set boot entry in bootloader This is to get rid of "install" option when booting quark with an image in hddimg format. EFI installer doesn't work on quark at this point. Signed-off-by: Jianxun Zhang Signed-off-by: Saul Wold --- conf/machine/intel-quark.conf | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'conf') diff --git a/conf/machine/intel-quark.conf b/conf/machine/intel-quark.conf index 70cb45e5..c001302b 100644 --- a/conf/machine/intel-quark.conf +++ b/conf/machine/intel-quark.conf @@ -20,6 +20,15 @@ APPEND += "rootwait console=ttyS1,115200 console=tty0" EFI_PROVIDER = "systemd-boot" +# Bypass the default labels which also has "install" option in OE. +# +# We don't need to do this when constructing direct-boot image with +# wic. But EFI installer in hddimg image doesn't work on quark now, +# so we only provide a live-boot entry in boot menu for images in +# hddimg format. + +LABELS_LIVE = "boot" + # Ensure that the Lock prefix is omitted for the kernel" KERNEL_EXTRA_ARGS = "EXTRA_CFLAGS=-Wa,-momit-lock-prefix=yes" -- cgit v1.2.3-54-g00ecf