From d109354c0f1d4b155c60701cd42e632213350d72 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Tue, 6 Jul 2021 16:34:33 +0200 Subject: Makefile.inc: Drop the cbfs master header from non-X86 The pointer to the header has a x86 top mmaped address even though the boot medium is not mapped that way. If no pointer is used to find the header FMAP is needed. If FMAP is used anyway there is no need for a cbfs master header. Change-Id: I6d693bdd4ddaf4c9b3cffb4ea9879c761200aca9 Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/56120 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- Makefile.inc | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'Makefile.inc') diff --git a/Makefile.inc b/Makefile.inc index b1c706709a..fee73f5c06 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1101,22 +1101,15 @@ ifeq ($(CONFIG_ARCH_X86),y) -b -$(call file-size,$(objcbfs)/bootblock.bin) $(cbfs-autogen-attributes) \ $(TS_OPTIONS) \ $(CBFSTOOL_ADD_CMD_OPTIONS) + # the cbfs master header is a deprecated feature only used on x86 + $(CBFSTOOL) $@.tmp add-master-header $(TS_OPTIONS) $(CBFSTOOL_ADD_CMD_OPTIONS) else # ifeq ($(CONFIG_ARCH_X86),y) $(CBFSTOOL) $@.tmp write -u \ -r BOOTBLOCK \ -f $(objcbfs)/bootblock.bin # make space for the CBFS master header pointer. "ptr_" is just # arbitrary 4 bytes that will be overwritten by add-master-header. - printf "ptr_" > $@.tmp.2 - $(CBFSTOOL) $@.tmp add \ - -f $@.tmp.2 \ - -n "header pointer" \ - -t "cbfs header" \ - -b -4 \ - $(CBFSTOOL_ADD_CMD_OPTIONS) - rm -f $@.tmp.2 endif # ifeq ($(CONFIG_ARCH_X86),y) - $(CBFSTOOL) $@.tmp add-master-header $(TS_OPTIONS) $(CBFSTOOL_ADD_CMD_OPTIONS) $(prebuild-files) true mv $@.tmp $@ else # ifneq ($(CONFIG_UPDATE_IMAGE),y) -- cgit v1.2.3