summaryrefslogtreecommitdiff
path: root/Makefile.inc
diff options
context:
space:
mode:
authorAlexandru Gagniuc <mr.nuke.me@gmail.com>2015-09-07 00:35:55 -0700
committerAlexandru Gagniuc <mr.nuke.me@gmail.com>2015-09-07 23:51:30 +0000
commitf55e6680b94a12bdbe8bf4860b3323dac41a9a11 (patch)
treeea3f137ff56d6bcebfb08f0487199789028eb580 /Makefile.inc
parent9647094672eb2ea31c6192de92028614164b9d9c (diff)
downloadcoreboot-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 'Makefile.inc')
-rw-r--r--Makefile.inc1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.inc b/Makefile.inc
index 1cac01b47c..be6021b4f6 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -567,7 +567,6 @@ $(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(FMAPTOOL) $(
-B $(objcbfs)/bootblock.bin \
$(CBFSTOOL_PRE1_OPTS)
$(prebuild-files) true
- $(call add-cpu-microcode-to-cbfs,$@.tmp)
mv $@.tmp $@
else
prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))