aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2018-04-13 13:46:51 -0700
committerCalifornia Sullivan <california.l.sullivan@intel.com>2018-04-17 14:13:19 -0700
commit1bb458d13ec0f525d0866d8727e046fdf1443be5 (patch)
treefa4d8a18d45dfbce5b337b7430a706981f865d95
parent83d31356602172bb86c2eb5b83d81c301b1baaf9 (diff)
downloadmeta-intel-1bb458d13ec0f525d0866d8727e046fdf1443be5.tar.gz
meta-intel-1bb458d13ec0f525d0866d8727e046fdf1443be5.tar.bz2
meta-intel-1bb458d13ec0f525d0866d8727e046fdf1443be5.zip
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> (cherry picked from commit e84508f1ba16a67455e336b6d8f16155299784b6) Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
-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 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"
APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0"
IMAGE_FSTYPES += "wic"
-WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}"
+WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk-microcode.wks", "mkefidisk.wks", d)}"
+WKS_FILE_DEPENDS_append = " intel-microcode"
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index 47ad16d9..c9107161 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -42,4 +42,5 @@ SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2"
APPEND += "rootwait console=ttyS0,115200 console=tty0"
IMAGE_FSTYPES += "wic"
-WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}"
+WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk-microcode.wks", "mkefidisk.wks", d)}"
+WKS_FILE_DEPENDS_append = " intel-microcode"