diff options
| author | Anuj Mittal <anuj.mittal@intel.com> | 2018-06-04 16:02:41 +0800 |
|---|---|---|
| committer | Anuj Mittal <anuj.mittal@intel.com> | 2018-06-12 14:41:40 +0800 |
| commit | ab0126ca1e8c885a7ce19a6a8cb8bc32acb50de5 (patch) | |
| tree | a39e908f49ed459e69e7a3e3c297a7e4009a34b0 | |
| parent | 09879b0e951813867c490596c215c60e7880d4cb (diff) | |
| download | meta-intel-ab0126ca1e8c885a7ce19a6a8cb8bc32acb50de5.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.conf | 2 | ||||
| -rw-r--r-- | conf/machine/intel-corei7-64.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf index 90c7956d..cd3ad574 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" | |||
| 31 | APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0" | 31 | APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0" |
| 32 | 32 | ||
| 33 | IMAGE_FSTYPES += "wic" | 33 | IMAGE_FSTYPES += "wic" |
| 34 | WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk-microcode.wks", "mkefidisk.wks", d)}" | 34 | WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk-microcode.wks", "grub-bootdisk-microcode.wks", d)}" |
| 35 | WKS_FILE_DEPENDS_append = " intel-microcode" | 35 | WKS_FILE_DEPENDS_append = " intel-microcode" |
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf index 9467d090..3fe2dcff 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" | |||
| 40 | APPEND += "rootwait console=ttyS0,115200 console=tty0" | 40 | APPEND += "rootwait console=ttyS0,115200 console=tty0" |
| 41 | 41 | ||
| 42 | IMAGE_FSTYPES += "wic" | 42 | IMAGE_FSTYPES += "wic" |
| 43 | WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk-microcode.wks", "mkefidisk.wks", d)}" | 43 | WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk-microcode.wks", "grub-bootdisk-microcode.wks", d)}" |
| 44 | WKS_FILE_DEPENDS_append = " intel-microcode" | 44 | WKS_FILE_DEPENDS_append = " intel-microcode" |