aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJianxun Zhang <jianxun.zhang@linux.intel.com>2016-10-19 15:07:25 -0700
committerSaul Wold <sgw@linux.intel.com>2016-11-01 08:23:15 -0700
commit15ac2f84ed67032c885e82254eda8053d601c95e (patch)
treedf2ac3f5d13782193a120bbc6d420e40ad4e1c24
parentf3c4c983c100bbb571ff932e4e7aed4683cde211 (diff)
downloadmeta-intel-15ac2f84ed67032c885e82254eda8053d601c95e.tar.gz
meta-intel-15ac2f84ed67032c885e82254eda8053d601c95e.tar.bz2
meta-intel-15ac2f84ed67032c885e82254eda8053d601c95e.zip
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 <jianxun.zhang@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--conf/machine/intel-quark.conf9
1 files changed, 9 insertions, 0 deletions
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"