GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Alexandru Gagniuc 2015-09-07 00:35:55 -07:00
parent 9647094672
commit f55e6680b9
4 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.inc
View File

@ -567,7 +567,6 @@ $(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(FMAPTOOL) $(
-B $(objcbfs)/bootblock.bin \ -B $(objcbfs)/bootblock.bin \
$(CBFSTOOL_PRE1_OPTS) $(CBFSTOOL_PRE1_OPTS)
$(prebuild-files) true $(prebuild-files) true
$(call add-cpu-microcode-to-cbfs,$@.tmp)
mv $@.tmp $@ mv $@.tmp $@
else else
prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file))) prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))

20
src/cpu/Makefile.inc
View File

@ -18,8 +18,6 @@ $(eval $(call create_class_compiler,cpu_microcode,x86_64))
## Rules for building the microcode blob in CBFS ## Rules for building the microcode blob in CBFS
################################################################################ ################################################################################
cpu_ucode_cbfs_name = cpu_microcode_blob.bin
# External microcode file, or are we generating one ? # External microcode file, or are we generating one ?
ifeq ($(CONFIG_CPU_MICROCODE_CBFS_EXTERNAL), y) ifeq ($(CONFIG_CPU_MICROCODE_CBFS_EXTERNAL), y)
cpu_ucode_cbfs_file = $(call strip_quotes,$(CONFIG_CPU_MICROCODE_FILE)) 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 cbfs_include_ucode = y
endif 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 # 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 # 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. # 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" @printf " MICROCODE $(subst $(obj)/,,$(@))\n"
$(OBJCOPY_cpu_microcode) -j .data -O binary $< $@ $(OBJCOPY_cpu_microcode) -j .data -O binary $< $@
ifeq ($(cbfs_include_ucode),y) cbfs-files-$(cbfs_include_ucode) += cpu_microcode_blob.bin
# Add CPU microcode to specified rom image $(1) cpu_microcode_blob.bin-file := $(cpu_ucode_cbfs_file)
add-cpu-microcode-to-cbfs = \ cpu_microcode_blob.bin-type := microcode
$(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)
ifneq ($(CONFIG_CPU_MICROCODE_CBFS_LOC),)
cpu_microcode_blob.bin-position := $(CONFIG_CPU_MICROCODE_CBFS_LOC)
else else
add-cpu-microcode-to-cbfs = true cpu_microcode_blob.bin-align := 16
endif endif

11
src/soc/intel/braswell/microcode/Makefile.inc
View File

@ -1,13 +1,2 @@
# Add CPU uCode source to list of files to build. # Add CPU uCode source to list of files to build.
cpu_microcode-y += microcode_blob.c cpu_microcode-y += microcode_blob.c
# This section overrides the default build process for the microcode to place
# it at a known location in the CBFS. This only needs to be enabled if FSP is
# being used.
# Define the correct offset for the file in CBFS
fsp_ucode_cbfs_base = $(CONFIG_CPU_MICROCODE_CBFS_LOC)
# Override the location that was supplied by the core code.
add-cpu-microcode-to-cbfs = \
$(CBFSTOOL) $(1) add -n $(cpu_ucode_cbfs_name) -f $(cpu_ucode_cbfs_file) -t microcode -b $(fsp_ucode_cbfs_base)

11
src/soc/intel/skylake/microcode/Makefile.inc
View File

@ -1,13 +1,2 @@
# Add CPU uCode source to list of files to build. # Add CPU uCode source to list of files to build.
cpu_microcode-$(CONFIG_CPU_MICROCODE_CBFS_GENERATE) += microcode_blob.c cpu_microcode-$(CONFIG_CPU_MICROCODE_CBFS_GENERATE) += microcode_blob.c
# This section overrides the default build process for the microcode to place
# it at a known location in the CBFS. This only needs to be enabled if FSP is
# being used.
# Define the correct offset for the file in CBFS
fsp_ucode_cbfs_base = $(CONFIG_CPU_MICROCODE_CBFS_LOC)
# Override the location that was supplied by the core code.
add-cpu-microcode-to-cbfs = \
$(CBFSTOOL) $(1) add -n $(cpu_ucode_cbfs_name) -f $(cpu_ucode_cbfs_file) -t microcode -b $(fsp_ucode_cbfs_base)