cpu/amd/model_10xxx: Install AMD-provided microcode files in CBFS

Change-Id: I208b012c6b612a94b3bbc8235d5a005028be8bcc
Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
Reviewed-on: http://review.coreboot.org/11832
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Timothy Pearson 2015-10-08 16:58:58 -05:00 committed by Aaron Durbin
parent 6a70dbc397
commit 24e6d0445c
5 changed files with 16 additions and 2 deletions

2
3rdparty/blobs vendored

@ -1 +1 @@
Subproject commit 832bc6f1f8ffafc5ff397fd95616fdae988f224f Subproject commit aab093f0824b6d26b57a1ce220ba0d577e37ad49

View File

@ -153,6 +153,14 @@ config CPU_MICROCODE_CBFS_NONE
endchoice endchoice
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_FILE config CPU_MICROCODE_FILE
string "Path and filename of CPU microcode" string "Path and filename of CPU microcode"
depends on CPU_MICROCODE_CBFS_EXTERNAL depends on CPU_MICROCODE_CBFS_EXTERNAL

View File

@ -24,9 +24,11 @@ cbfs_include_ucode = y
endif endif
ifeq ($(CONFIG_CPU_MICROCODE_CBFS_GENERATE), y) ifeq ($(CONFIG_CPU_MICROCODE_CBFS_GENERATE), y)
ifneq ($(CONFIG_CPU_MICROCODE_MULTIPLE_FILES), y)
cpu_ucode_cbfs_file = $(obj)/cpu_microcode_blob.bin cpu_ucode_cbfs_file = $(obj)/cpu_microcode_blob.bin
cbfs_include_ucode = y cbfs_include_ucode = y
endif endif
endif
# We just mash all microcode binaries together into one binary to rule them all. # We just mash all microcode binaries together into one binary to rule them all.
# This approach assumes that the microcode binaries are properly padded, and # This approach assumes that the microcode binaries are properly padded, and

View File

@ -11,6 +11,7 @@ config CPU_AMD_MODEL_10XXX
select UDELAY_LAPIC select UDELAY_LAPIC
select HAVE_MONOTONIC_TIMER select HAVE_MONOTONIC_TIMER
select SUPPORT_CPU_UCODE_IN_CBFS select SUPPORT_CPU_UCODE_IN_CBFS
select CPU_MICROCODE_MULTIPLE_FILES
if CPU_AMD_MODEL_10XXX if CPU_AMD_MODEL_10XXX

View File

@ -8,4 +8,7 @@ ramstage-y += ram_calc.c
ramstage-y += monotonic_timer.c ramstage-y += monotonic_timer.c
ramstage-$(CONFIG_HAVE_ACPI_TABLES) += powernow_acpi.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