diff options
| author | Patrick Georgi <pgeorgi@chromium.org> | 2016-01-28 21:51:55 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2016-01-29 17:18:59 +0100 |
| commit | 60fad89091dec4f34803a3320de73198b1124002 (patch) | |
| tree | b383975d2bbb6c46c7e7c19b25f489aae2accd9d | |
| parent | 35a2bcaa213e68f6254350d9f94a700d68c6e550 (diff) | |
build system: deduplicate use of cbfs-autogen-attributes
Also drop the second argument to cbfs-add-cmd because it's not needed
anymore.
Change-Id: Ie01d73f6b2aff09caccc397f72d6d8065624aebe
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: https://review.coreboot.org/13502
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
| -rw-r--r-- | Makefile.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.inc b/Makefile.inc index c5a9699e63..3fcddbc1d3 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -656,11 +656,12 @@ define cbfs-add-cmd -f $(call extract_nth,1,$(1)) \ -n $(call extract_nth,2,$(1)) \ $(if $(filter-out stage,$(call extract_nth,3,$(1))),-t $(call extract_nth,3,$(1))) \ - $(if $(call extract_nth,4,$(1)),-c $(call extract_nth,4,$(1))) $(cbfs-autogen-attributes)\ + $(if $(call extract_nth,4,$(1)),-c $(call extract_nth,4,$(1))) \ + $(cbfs-autogen-attributes) \ -r $(call regions-for-file,$(call extract_nth,2,$(1))) \ $(if $(call extract_nth,6,$(1)),-a $(call extract_nth,6,$(file)), \ $(if $(call extract_nth,5,$(file)),-b $(call extract_nth,5,$(file)))) \ - $(call extract_nth,7,$(1)) $(2) + $(call extract_nth,7,$(1)) endef cbfs-files=$(cbfs-files-fixed) $(cbfs-files-aligned) $(cbfs-files-regular) @@ -764,7 +765,7 @@ prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file))) prebuild-files = \ $(foreach file,$(cbfs-files), \ $(CBFSTOOL) $@.tmp remove -n $(call extract_nth,2,$(file)) 2>/dev/null ; \ - $(call cbfs-add-cmd,$(file),$(cbfs-autogen-attributes))) + $(call cbfs-add-cmd,$(file))) .PHONY: $(obj)/coreboot.pre $(obj)/coreboot.pre: $$(prebuilt-files) $(CBFSTOOL) |