summaryrefslogtreecommitdiffstats
path: root/Makefile.inc
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2022-03-30 21:31:27 +0200
committerArthur Heymans <arthur@aheymans.xyz>2022-05-12 11:12:10 +0000
commit31187bb0e0539cd3f93b0b9c045d09007030e57d (patch)
tree7b5aa6a28caf384eb0701149b3afda35a7d8b219 /Makefile.inc
parentabf6b1ed00bf6ae1fce53bb476cbc036a5e8f3a3 (diff)
downloadcoreboot-31187bb0e0539cd3f93b0b9c045d09007030e57d.tar.gz
coreboot-31187bb0e0539cd3f93b0b9c045d09007030e57d.tar.bz2
coreboot-31187bb0e0539cd3f93b0b9c045d09007030e57d.zip
Makefile.inc: Add x86 bootblock as a separate target
Some platforms don't need a top aligned bootblock in cbfs like Intel APL or modern AMD platforms as the bootblock is loaded differently. So they don't need the top aligned cbfs bootblock. To not clutter the main make file move out adding the bootblock. Change-Id: I4de9d7fedf1ae5a37a3310dd42eb07b44c030930 Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/56122 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Raul Rangel <rrangel@chromium.org>
Diffstat (limited to 'Makefile.inc')
-rw-r--r--Makefile.inc12
1 files changed, 1 insertions, 11 deletions
diff --git a/Makefile.inc b/Makefile.inc
index f7433a0c41d7..052edae5019e 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1105,18 +1105,8 @@ endif
$(shell rm -f $(obj)/coreboot.pre)
ifneq ($(CONFIG_UPDATE_IMAGE),y)
-$(obj)/coreboot.pre: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL) $(obj)/fmap.fmap $(obj)/fmap.desc
+$(obj)/coreboot.pre: $$(prebuilt-files) $(CBFSTOOL) $(obj)/fmap.fmap $(obj)/fmap.desc
$(CBFSTOOL) $@.tmp create -M $(obj)/fmap.fmap -r $(shell cat $(obj)/fmap.desc)
-ifeq ($(CONFIG_ARCH_X86),y)
- $(CBFSTOOL) $@.tmp add \
- -f $(objcbfs)/bootblock.bin \
- -n bootblock \
- -t bootblock \
- $(TXTIBB) \
- -b -$(call file-size,$(objcbfs)/bootblock.bin) $(cbfs-autogen-attributes) \
- $(TS_OPTIONS) \
- $(CBFSTOOL_ADD_CMD_OPTIONS)
-endif # ifeq ($(CONFIG_ARCH_X86),y)
$(prebuild-files) true
mv $@.tmp $@
else # ifneq ($(CONFIG_UPDATE_IMAGE),y)