diff options
| author | Alexandru Gagniuc <mr.nuke.me@gmail.com> | 2015-09-07 00:35:55 -0700 |
|---|---|---|
| committer | Alexandru Gagniuc <mr.nuke.me@gmail.com> | 2015-09-07 23:51:30 +0000 |
| commit | f55e6680b94a12bdbe8bf4860b3323dac41a9a11 (patch) | |
| tree | ea3f137ff56d6bcebfb08f0487199789028eb580 /src/cpu | |
| parent | 9647094672eb2ea31c6192de92028614164b9d9c (diff) | |
| download | coreboot-f55e6680b94a12bdbe8bf4860b3323dac41a9a11.tar.xz | |
microcode: Unify rules to add microcode to CBFS once again
Now that cbfstool supports file alignment, we can use the conveniently
available <filename>-align handler, and remove the need to have a
separate rule in src/Makefile.inc just for adding the microcode.
We can also get rid of the layering violation of having the
CONFIG_PLATFORM_USES_FSP1_0 symbol in a generic src/cpu/ makefile.
Note that we still have a layering violation by the use of the
CONFIG_CPU_MICROCODE_CBFS_LOC symbol, but this one is acceptable
for the time being.
Change-Id: Id2f8c15d250a0c75300d0a870284cac0c68a311b
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-on: http://review.coreboot.org/11526
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/cpu')
| -rw-r--r-- | src/cpu/Makefile.inc | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/cpu/Makefile.inc b/src/cpu/Makefile.inc index cdd353f20c..d757c79673 100644 --- a/src/cpu/Makefile.inc +++ b/src/cpu/Makefile.inc @@ -18,8 +18,6 @@ $(eval $(call create_class_compiler,cpu_microcode,x86_64)) ## Rules for building the microcode blob in CBFS ################################################################################ -cpu_ucode_cbfs_name = cpu_microcode_blob.bin - # External microcode file, or are we generating one ? ifeq ($(CONFIG_CPU_MICROCODE_CBFS_EXTERNAL), y) cpu_ucode_cbfs_file = $(call strip_quotes,$(CONFIG_CPU_MICROCODE_FILE)) @@ -31,12 +29,6 @@ cpu_ucode_cbfs_file = $(obj)/cpu_microcode_blob.bin cbfs_include_ucode = y endif -ifeq ($(CONFIG_PLATFORM_USES_FSP1_0), y) -cpu_ucode_cbfs_offset = "-b $(CONFIG_CPU_MICROCODE_CBFS_LOC)" -else -cpu_ucode_cbfs_offset = "-b" -endif - # In case we have more than one "source" (cough) files containing microcode, we # link them together in one large blob, so that we get all the microcode updates # in one file. This makes it easier for objcopy in the final step. @@ -52,10 +44,12 @@ $(obj)/cpu_microcode_blob.bin: $(obj)/cpu_microcode_blob.o @printf " MICROCODE $(subst $(obj)/,,$(@))\n" $(OBJCOPY_cpu_microcode) -j .data -O binary $< $@ -ifeq ($(cbfs_include_ucode),y) -# Add CPU microcode to specified rom image $(1) -add-cpu-microcode-to-cbfs = \ - $(CBFSTOOL) $(1) locate -f $(cpu_ucode_cbfs_file) -n $(cpu_ucode_cbfs_name) -a 16 | xargs $(CBFSTOOL) $(1) add -n $(cpu_ucode_cbfs_name) -f $(cpu_ucode_cbfs_file) -t 0x53 $(cpu_ucode_cbfs_offset) +cbfs-files-$(cbfs_include_ucode) += cpu_microcode_blob.bin +cpu_microcode_blob.bin-file := $(cpu_ucode_cbfs_file) +cpu_microcode_blob.bin-type := microcode + +ifneq ($(CONFIG_CPU_MICROCODE_CBFS_LOC),) +cpu_microcode_blob.bin-position := $(CONFIG_CPU_MICROCODE_CBFS_LOC) else -add-cpu-microcode-to-cbfs = true +cpu_microcode_blob.bin-align := 16 endif |