From 23846440dfd1a69d11647fef6a623569b87ad6f5 Mon Sep 17 00:00:00 2001 From: Raul E Rangel Date: Fri, 18 Mar 2022 09:54:19 -0600 Subject: Makefile.inc: Explicitly delete coreboot.pre MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit coreboot.pre doesn't follow the standard Make conventions. It gets modified by multiple rules, and thus we can't compute the dependencies correctly. This means we need to manually delete it before starting the dependency calculations. i.e., Building firmware with the seabios payload now works correctly. Fixes: dd6efce934f ("Makefile: Add .SECONDARY") Signed-off-by: Raul E Rangel Change-Id: If5fa3f0b8d314369a044658e452bd75bc7709397 Reviewed-on: https://review.coreboot.org/c/coreboot/+/62922 Tested-by: build bot (Jenkins) Reviewed-by: Michael Niewöhner --- Makefile.inc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Makefile.inc') diff --git a/Makefile.inc b/Makefile.inc index 929c236dd6..377ddff994 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1116,6 +1116,10 @@ ifeq ($(CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK),y) TS_OPTIONS := -j $(CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE) endif +# coreboot.pre doesn't follow the standard Make conventions. It gets modified +# by multiple rules, and thus we can't compute the dependencies correctly. +$(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 $(CBFSTOOL) $@.tmp create -M $(obj)/fmap.fmap -r $(shell cat $(obj)/fmap.desc) -- cgit v1.2.3