[coreboot-gerrit] New patch to review for coreboot: build system: replace files on UPDATE_IMAGE
Patrick Georgi (pgeorgi@google.com)
gerrit at coreboot.org
Tue Dec 1 18:37:01 CET 2015
Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12581
-gerrit
commit 57bafa174d5984a5cd7124de1f77f1c9307c0635
Author: Patrick Georgi <pgeorgi at chromium.org>
Date: Tue Dec 1 18:34:42 2015 +0100
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 <pgeorgi at chromium.org>
---
Makefile.inc | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/Makefile.inc b/Makefile.inc
index 9d754ad..8209863 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/<filename>
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)
More information about the coreboot-gerrit
mailing list