[coreboot-gerrit] Patch set updated for coreboot: cpu/microcode: Avoid build hang when no microcode available
Timothy Pearson (tpearson@raptorengineeringinc.com)
gerrit at coreboot.org
Wed Oct 14 23:21:34 CEST 2015
Timothy Pearson (tpearson at raptorengineeringinc.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11902
-gerrit
commit 3685756590a7468d0a1df44e19ab1b05eb9149ad
Author: Timothy Pearson <tpearson at raptorengineeringinc.com>
Date: Wed Oct 14 15:26:28 2015 -0500
cpu/microcode: Avoid build hang when no microcode available
Change-Id: I245b99ed1eb9219100e5406e76b9524a7b300d96
Signed-off-by: Timothy Pearson <tpearson at raptorengineeringinc.com>
---
src/cpu/Kconfig | 5 +----
src/cpu/Makefile.inc | 12 +++++++++---
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig
index df1ca40..52eaf15 100644
--- a/src/cpu/Kconfig
+++ b/src/cpu/Kconfig
@@ -70,14 +70,11 @@ config SUPPORT_CPU_UCODE_IN_CBFS
config CPU_MICROCODE_MULTIPLE_FILES
bool
default n
+ depends on CPU_MICROCODE_CBFS_GENERATE
help
Select this option to install separate microcode container files into
CBFS instead of using the traditional monolithic microcode file format.
-config CPU_MICROCODE_CBFS_GENERATE_MONOLITHIC_FILE
- bool
- default y if !CPU_MICROCODE_MULTIPLE_FILES
-
choice
prompt "Include CPU microcode in CBFS" if ARCH_X86
default CPU_MICROCODE_CBFS_GENERATE if SUPPORT_CPU_UCODE_IN_CBFS && USE_BLOBS
diff --git a/src/cpu/Makefile.inc b/src/cpu/Makefile.inc
index c522bb7..6db09ba 100644
--- a/src/cpu/Makefile.inc
+++ b/src/cpu/Makefile.inc
@@ -17,9 +17,11 @@ $(eval $(call create_class_compiler,cpu_microcode,x86_32))
## Rules for building the microcode blob in CBFS
################################################################################
-ifeq ($(CONFIG_CPU_MICROCODE_CBFS_GENERATE_MONOLITHIC_FILE), y)
+ifeq ($(CONFIG_CPU_MICROCODE_MULTIPLE_FILES), n)
cpu_ucode_cbfs_file = $(obj)/cpu_microcode_blob.bin
-cbfs_include_ucode = y
+generate-monolithic-file = y
+else
+generate-monolithic-file = n
endif
# We just mash all microcode binaries together into one binary to rule them all.
@@ -30,11 +32,15 @@ endif
# there is only one microcode binary (i.e. one container), then we don't have
# this issue, and this rule will continue to work.
$(obj)/cpu_microcode_blob.bin: $$(cpu_microcode_bins)
+ifeq ($(cpu_microcode_bins),)
+ touch $@
+else
@printf " MICROCODE $(subst $(obj)/,,$(@))\n"
@echo $(cpu_microcode_bins)
cat $+ > $@
+endif
-cbfs-files-$(cbfs_include_ucode) += cpu_microcode_blob.bin
+cbfs-files-$(generate-monolithic-file) += cpu_microcode_blob.bin
cpu_microcode_blob.bin-file := $(cpu_ucode_cbfs_file)
cpu_microcode_blob.bin-type := microcode
More information about the coreboot-gerrit
mailing list