[coreboot-gerrit] Patch set updated for coreboot: cpu/amd/model_10xxx: Install AMD-provided microcode files in CBFS

[Timothy Pearson (tpearson@raptorengineeringinc.com)]

Timothy Pearson (tpearson at raptorengineeringinc.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11832

-gerrit

commit af9f32256b1a6c8cce73f55dd07002cb5eb88823
Author: Timothy Pearson <tpearson at raptorengineeringinc.com>
Date:   Thu Oct 8 16:58:58 2015 -0500

    cpu/amd/model_10xxx: Install AMD-provided microcode files in CBFS
    
    Change-Id: I208b012c6b612a94b3bbc8235d5a005028be8bcc
    Signed-off-by: Timothy Pearson <tpearson at raptorengineeringinc.com>
---
 3rdparty/blobs                       |  2 +-
 src/cpu/Kconfig                      |  8 ++++++++
 src/cpu/Makefile.inc                 |  8 ++++++--
 src/cpu/amd/model_10xxx/Kconfig      |  1 +
 src/cpu/amd/model_10xxx/Makefile.inc | 10 +++++++++-
 5 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/3rdparty/blobs b/3rdparty/blobs
index 832bc6f..aab093f 160000
--- a/3rdparty/blobs
+++ b/3rdparty/blobs
@@ -1 +1 @@
-Subproject commit 832bc6f1f8ffafc5ff397fd95616fdae988f224f
+Subproject commit aab093f0824b6d26b57a1ce220ba0d577e37ad49
diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig
index 1f3dc66..52eaf15 100644
--- a/src/cpu/Kconfig
+++ b/src/cpu/Kconfig
@@ -67,6 +67,14 @@ config SUPPORT_CPU_UCODE_IN_CBFS
 	bool
 	default n
 
+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.
+
 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 0172208..5185c2f 100644
--- a/src/cpu/Makefile.inc
+++ b/src/cpu/Makefile.inc
@@ -18,8 +18,12 @@ $(eval $(call create_class_compiler,cpu_microcode,x86_32))
 ################################################################################
 
 ifeq ($(CONFIG_CPU_MICROCODE_CBFS_GENERATE), 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
 endif
 
 # We just mash all microcode binaries together into one binary to rule them all.
@@ -34,7 +38,7 @@ $(obj)/cpu_microcode_blob.bin: $$(cpu_microcode_bins)
 	@echo $(cpu_microcode_bins)
 	cat $+ > $@
 
-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
 
diff --git a/src/cpu/amd/model_10xxx/Kconfig b/src/cpu/amd/model_10xxx/Kconfig
index ebd282a..7c47e27 100644
--- a/src/cpu/amd/model_10xxx/Kconfig
+++ b/src/cpu/amd/model_10xxx/Kconfig
@@ -11,6 +11,7 @@ config CPU_AMD_MODEL_10XXX
 	select UDELAY_LAPIC
 	select HAVE_MONOTONIC_TIMER
 	select SUPPORT_CPU_UCODE_IN_CBFS
+	select CPU_MICROCODE_MULTIPLE_FILES
 
 if CPU_AMD_MODEL_10XXX
 
diff --git a/src/cpu/amd/model_10xxx/Makefile.inc b/src/cpu/amd/model_10xxx/Makefile.inc
index 122e474..6cd2513 100644
--- a/src/cpu/amd/model_10xxx/Makefile.inc
+++ b/src/cpu/amd/model_10xxx/Makefile.inc
@@ -8,4 +8,12 @@ ramstage-y += ram_calc.c
 ramstage-y += monotonic_timer.c
 ramstage-$(CONFIG_HAVE_ACPI_TABLES) += powernow_acpi.c
 
-cpu_microcode_bins += 3rdparty/blobs/cpu/amd/model_10xxx/microcode.bin
+# Microcode for Family 10h, 11h, 12h, and 14h
+cbfs-files-$(CONFIG_CPU_MICROCODE_MULTIPLE_FILES) += microcode_amd.bin
+microcode_amd.bin-file := 3rdparty/blobs/cpu/amd/family_10h-family_14h/microcode_amd.bin
+microcode_amd.bin-type := microcode
+
+# Microcode for Family 15h
+cbfs-files-$(CONFIG_CPU_MICROCODE_MULTIPLE_FILES) += microcode_amd_fam15h.bin
+microcode_amd_fam15h.bin-file := 3rdparty/blobs/cpu/amd/family_15h/microcode_amd_fam15h.bin
+microcode_amd_fam15h.bin-type := microcode