diff options
| author | Patrick Georgi <pgeorgi@chromium.org> | 2016-01-28 21:37:16 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2016-01-29 17:18:16 +0100 |
| commit | 172f8865865dba897e316c8f029e290a3fd101d8 (patch) | |
| tree | 2c82bc6ac627afbc85dfc5406cdb063210af89da | |
| parent | 4ba65aacae94c210b4788d0d6a8891c368c59d99 (diff) | |
build system: separate cbfstool add invocations into separate commands
They used to be chained into a single make shell invocation but now
they're individual commands, which makes them easier to manage.
Change-Id: I22394fd31989d5180790818153f466c0e7ebbedd
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: https://review.coreboot.org/13499
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
| -rw-r--r-- | Makefile.inc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Makefile.inc b/Makefile.inc index 8649e5511a..c46126af0a 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -649,8 +649,8 @@ ifeq ($(CONFIG_CBFS_AUTOGEN_ATTRIBUTES),y) cbfs-autogen-attributes=-g endif -cbfs-add-cmd = \ - printf " CBFS $(call extract_nth,2,$(file))\n"; \ +define cbfs-add-cmd + printf " CBFS $(call extract_nth,2,$(file))\n" $(CBFSTOOL) $@.tmp \ add$(if $(filter stage,$(call extract_nth,3,$(file))),-stage)$(if $(filter payload,$(call extract_nth,3,$(file))),-payload) \ -f $(call extract_nth,1,$(file)) \ @@ -658,14 +658,15 @@ cbfs-add-cmd = \ $(if $(filter-out stage,$(call extract_nth,3,$(file))),-t $(call extract_nth,3,$(file))) \ $(if $(call extract_nth,4,$(file)),-c $(call extract_nth,4,$(file))) $(cbfs-autogen-attributes)\ -r $(call regions-for-file,$(call extract_nth,2,$(file))) \ - $(call extract_nth,7,$(file)) + $(call extract_nth,7,$(file)) $(1) +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)),$(cbfs-add-cmd) -a $(call extract_nth,6,$(file)) &&, \ - $(cbfs-add-cmd) $(if $(call extract_nth,5,$(file)),-b $(call extract_nth,5,$(file))) &&)) + $(if $(call extract_nth,6,$(file)),$(call cbfs-add-cmd,-a $(call extract_nth,6,$(file))), \ + $(call cbfs-add-cmd,$(if $(call extract_nth,5,$(file)),-b $(call extract_nth,5,$(file)))))) prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file))) ifeq ($(CONFIG_FMDFILE),) @@ -764,9 +765,9 @@ 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)),$(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-autogen-attributes) &&)) + $(if $(call extract_nth,6,$(file)),$(call cbfs-add-cmd,-a $(call extract_nth,6,$(file))),\ + $(call cbfs-add-cmd,$(if $(call extract_nth,5,$(file)),-b $(call extract_nth,5,$(file))) \ + $(cbfs-autogen-attributes)))) .PHONY: $(obj)/coreboot.pre $(obj)/coreboot.pre: $$(prebuilt-files) $(CBFSTOOL) |