diff options
| author | Martin Roth <martinroth@google.com> | 2015-11-05 08:03:45 -0700 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2015-11-10 19:22:40 +0100 |
| commit | 4c502697eef81238c71b1570e4ee9d9ee08455d5 (patch) | |
| tree | ab637a6bd3e1ecf7374094af81557640cc324860 /src/cpu/Makefile.inc | |
| parent | 295358454aa214f1c915c2f340f8897bbd500b45 (diff) | |
cpu: Add a way to use microcode .h files back to the build
The build was changed to remove usage of microcode .h files when
all of the .h files were converted to binary. This is still
needed for some builds when microcode binaries aren't in the
blobs tree.
Change-Id: Ia323c90efe8aa0b8799fc5cce6197509e466a105
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: http://review.coreboot.org/12333
Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com>
Reviewed-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
Tested-by: build bot (Jenkins)
Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
Diffstat (limited to 'src/cpu/Makefile.inc')
| -rw-r--r-- | src/cpu/Makefile.inc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/cpu/Makefile.inc b/src/cpu/Makefile.inc index 517cbfaaf5..046c418554 100644 --- a/src/cpu/Makefile.inc +++ b/src/cpu/Makefile.inc @@ -21,6 +21,15 @@ ifneq ($(CONFIG_CPU_MICROCODE_MULTIPLE_FILES), y) cbfs-files-$(CONFIG_CPU_MICROCODE_CBFS_GENERATE) += cpu_microcode_blob.bin endif +ifeq ($(CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER),y) +cbfs-files-y += cpu_microcode_blob.bin +cpu_microcode_blob.bin-file = $(objgenerated)/microcode.bin + +$(objgenerated)/microcode.bin: + echo " util/scripts/ucode_h_to_bin.sh $(objgenerated)/microcode.bin \"$(CONFIG_CPU_MICROCODE_HEADER_FILES)\"" + util/scripts/ucode_h_to_bin.sh $(objgenerated)/microcode.bin $(CONFIG_CPU_MICROCODE_HEADER_FILES) +endif + # 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 # their headers specify the correct size. This works fairly well on isolatied @@ -33,7 +42,7 @@ $(obj)/cpu_microcode_blob.bin: $$(cpu_microcode_bins) @echo $(cpu_microcode_bins) cat /dev/null $+ > $@ -cpu_microcode_blob.bin-file := $(obj)/cpu_microcode_blob.bin +cpu_microcode_blob.bin-file ?= $(obj)/cpu_microcode_blob.bin cpu_microcode_blob.bin-type := microcode ifneq ($(CONFIG_CPU_MICROCODE_CBFS_LOC),) |