summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@chromium.org>2016-01-28 21:50:37 +0100
committerPatrick Georgi <pgeorgi@google.com>2016-01-29 17:18:40 +0100
commit35a2bcaa213e68f6254350d9f94a700d68c6e550 (patch)
tree9e04bcc8396310d4c55ab59918e22971d556ab83
parent93d53677da570f47e94940ffaf696ec2f9a18e0e (diff)
downloadcoreboot-35a2bcaa213e68f6254350d9f94a700d68c6e550.tar.xz
build system: deduplicate the addition of alignment/base arguments
Change-Id: I951606333d19cd6bf655294b8b3097884b6ac9e6 Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Reviewed-on: https://review.coreboot.org/13501 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <martinroth@google.com>
-rw-r--r--Makefile.inc11
1 files changed, 4 insertions, 7 deletions
diff --git a/Makefile.inc b/Makefile.inc
index 355f0df76f..c5a9699e63 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -658,15 +658,14 @@ define cbfs-add-cmd
$(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)\
-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)
endef
cbfs-files=$(cbfs-files-fixed) $(cbfs-files-aligned) $(cbfs-files-regular)
ifneq ($(CONFIG_UPDATE_IMAGE),y)
-prebuild-files = \
- $(foreach file,$(cbfs-files), \
- $(if $(call extract_nth,6,$(file)),$(call cbfs-add-cmd,$(file),-a $(call extract_nth,6,$(file))), \
- $(call cbfs-add-cmd,$(file),$(if $(call extract_nth,5,$(file)),-b $(call extract_nth,5,$(file))))))
+prebuild-files = $(foreach file,$(cbfs-files), $(call cbfs-add-cmd,$(file)))
prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))
ifeq ($(CONFIG_FMDFILE),)
@@ -765,9 +764,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 ; \
- $(if $(call extract_nth,6,$(file)),$(call cbfs-add-cmd,$(file),-a $(call extract_nth,6,$(file))),\
- $(call cbfs-add-cmd,$(file),$(if $(call extract_nth,5,$(file)),-b $(call extract_nth,5,$(file))) \
- $(cbfs-autogen-attributes))))
+ $(call cbfs-add-cmd,$(file),$(cbfs-autogen-attributes)))
.PHONY: $(obj)/coreboot.pre
$(obj)/coreboot.pre: $$(prebuilt-files) $(CBFSTOOL)