From 89b4abdf80ae64374f378058bc3f2f5484a7f977 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Tue, 1 Dec 2015 18:34:42 +0100 Subject: build system: replace files on UPDATE_IMAGE So far the build system only added files starting with CBFS_PREFIX/ in the UPDATE_IMAGE configuration, but there are a number of files that exist in the global namespace (eg. config, revision, but also cmos_layout.bin). Now, existing files are removed if necessary. Change-Id: I977ff85fe18115c84268103be72e91ca854e62a4 Signed-off-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/12581 Reviewed-by: Timothy Pearson Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Tested-by: Raptor Engineering Automated Test Stand Tested-by: BSI firmware lab --- Makefile.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 9d754ad87c..8209863546 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -626,10 +626,9 @@ prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file))) # Add all cbfs files to image of the form: CONFIG_CBFS_PREFIX/ prebuild-files = \ $(foreach file,$(cbfs-files), \ - $(if $(filter $(CONFIG_CBFS_PREFIX)/%,\ - $(call extract_nth,2,$(file))), \ + $(CBFSTOOL) $@.tmp remove -n $(call extract_nth,2,$(file)) 2>/dev/null ; \ $(if $(call extract_nth,6,$(file)),$(cbfs-add-cmd) -a $(call extract_nth,6,$(file)) &&,\ - $(cbfs-add-cmd) $(if $(call extract_nth,5,$(file)),-b $(call extract_nth,5,$(file))) &&))) + $(cbfs-add-cmd) $(if $(call extract_nth,5,$(file)),-b $(call extract_nth,5,$(file))) &&)) .PHONY: $(obj)/coreboot.pre1 $(obj)/coreboot.pre1: $$(prebuilt-files) $(CBFSTOOL) -- cgit v1.2.3