diff options
| author | Patrick Georgi <pgeorgi@chromium.org> | 2015-12-01 18:34:42 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-12-02 11:48:14 +0100 |
| commit | 89b4abdf80ae64374f378058bc3f2f5484a7f977 (patch) | |
| tree | 5a48d421ad2f1aa072176cbe9a6ecb5c3757cfd0 | |
| parent | d9c193d8b3bcc73dff4f6085c5b6164c0f6a4108 (diff) | |
| download | coreboot-89b4abdf80ae64374f378058bc3f2f5484a7f977.tar.xz | |
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@chromium.org>
Reviewed-on: https://review.coreboot.org/12581
Reviewed-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com>
Tested-by: BSI firmware lab <coreboot-labor@bsi.bund.de>
| -rw-r--r-- | Makefile.inc | 5 |
1 files 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/<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) |