diff options
| author | California Sullivan <california.l.sullivan@intel.com> | 2018-04-13 13:46:51 -0700 |
|---|---|---|
| committer | California Sullivan <california.l.sullivan@intel.com> | 2018-04-13 16:41:13 -0700 |
| commit | e84508f1ba16a67455e336b6d8f16155299784b6 (patch) | |
| tree | 965d9d50fc9723c035fbb81dd9c96c98b48948e4 /conf | |
| parent | 4471c6835a59d1e5c70f0ddcb27e1e9913273ff0 (diff) | |
| download | meta-intel-e84508f1ba16a67455e336b6d8f16155299784b6.tar.gz | |
conf/machine/intel-core*: use systemd-bootdisk-microcode.wks by default
This allows early boot microcode updates by default.
Since microcode is needed, we also add intel-microcode to
WKS_FILE_DEPENDS.
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/intel-core2-32.conf | 3 | ||||
| -rw-r--r-- | conf/machine/intel-corei7-64.conf | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf index aa8a5793..90c7956d 100644 --- a/conf/machine/intel-core2-32.conf +++ b/conf/machine/intel-core2-32.conf | |||
| @@ -31,4 +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.wks", "mkefidisk.wks", d)}" | 34 | WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk-microcode.wks", "mkefidisk.wks", d)}" |
| 35 | WKS_FILE_DEPENDS_append = " intel-microcode" | ||
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf index 78c52eed..43614843 100644 --- a/conf/machine/intel-corei7-64.conf +++ b/conf/machine/intel-corei7-64.conf | |||
| @@ -41,4 +41,5 @@ SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2" | |||
| 41 | APPEND += "rootwait console=ttyS0,115200 console=tty0" | 41 | APPEND += "rootwait console=ttyS0,115200 console=tty0" |
| 42 | 42 | ||
| 43 | IMAGE_FSTYPES += "wic" | 43 | IMAGE_FSTYPES += "wic" |
| 44 | WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}" | 44 | WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk-microcode.wks", "mkefidisk.wks", d)}" |
| 45 | WKS_FILE_DEPENDS_append = " intel-microcode" | ||