summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2018-06-04 08:02:41 (GMT)
committerAnuj Mittal <anuj.mittal@intel.com>2018-06-04 08:02:41 (GMT)
commit77e7aecc9b5a99746774f93a7be5047c90c604be (patch)
treec1bc116e33e1d037f290ab8049c81fcd10e983e0
parent902d162d3e5c8fa33d2d617e02320e64c7e58b03 (diff)
downloadmeta-intel-77e7aecc9b5a99746774f93a7be5047c90c604be.tar.gz
intel-core*.conf: change wks to be used for grub-efi
Point to the meta-intel wks file when grub-efi is to be used. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r--conf/machine/intel-core2-32.conf2
-rw-r--r--conf/machine/intel-corei7-64.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index 90c7956..cd3ad57 100644
--- a/conf/machine/intel-core2-32.conf
+++ b/conf/machine/intel-core2-32.conf
@@ -31,5 +31,5 @@ SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyPCH0"
31APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0" 31APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0"
32 32
33IMAGE_FSTYPES += "wic" 33IMAGE_FSTYPES += "wic"
34WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk-microcode.wks", "mkefidisk.wks", d)}" 34WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk-microcode.wks", "grub-bootdisk-microcode.wks", d)}"
35WKS_FILE_DEPENDS_append = " intel-microcode" 35WKS_FILE_DEPENDS_append = " intel-microcode"
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index 9467d09..3fe2dcf 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -40,5 +40,5 @@ SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2"
40APPEND += "rootwait console=ttyS0,115200 console=tty0" 40APPEND += "rootwait console=ttyS0,115200 console=tty0"
41 41
42IMAGE_FSTYPES += "wic" 42IMAGE_FSTYPES += "wic"
43WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk-microcode.wks", "mkefidisk.wks", d)}" 43WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk-microcode.wks", "grub-bootdisk-microcode.wks", d)}"
44WKS_FILE_DEPENDS_append = " intel-microcode" 44WKS_FILE_DEPENDS_append = " intel-microcode"