summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2018-04-13 20:46:51 (GMT)
committerCalifornia Sullivan <california.l.sullivan@intel.com>2018-04-13 23:41:13 (GMT)
commite84508f1ba16a67455e336b6d8f16155299784b6 (patch)
tree965d9d50fc9723c035fbb81dd9c96c98b48948e4 /conf
parent4471c6835a59d1e5c70f0ddcb27e1e9913273ff0 (diff)
downloadmeta-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.conf3
-rw-r--r--conf/machine/intel-corei7-64.conf3
2 files changed, 4 insertions, 2 deletions
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index aa8a579..90c7956 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"
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.wks", "mkefidisk.wks", d)}" 34WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk-microcode.wks", "mkefidisk.wks", d)}"
35WKS_FILE_DEPENDS_append = " intel-microcode"
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index 78c52ee..4361484 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"
41APPEND += "rootwait console=ttyS0,115200 console=tty0" 41APPEND += "rootwait console=ttyS0,115200 console=tty0"
42 42
43IMAGE_FSTYPES += "wic" 43IMAGE_FSTYPES += "wic"
44WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}" 44WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk-microcode.wks", "mkefidisk.wks", d)}"
45WKS_FILE_DEPENDS_append = " intel-microcode"