diff options
| author | Patrick Georgi <pgeorgi@chromium.org> | 2016-01-28 21:47:31 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2016-01-29 17:18:28 +0100 |
| commit | 93d53677da570f47e94940ffaf696ec2f9a18e0e (patch) | |
| tree | 3dac239e8eaa629f0e55f169fc0b340295021392 /Makefile.inc | |
| parent | 172f8865865dba897e316c8f029e290a3fd101d8 (diff) | |
build system: pass $(file) explicitly
And not in the global context.
Change-Id: Ife7394b1343663456c24316df6a07d883adb9ee9
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: https://review.coreboot.org/13500
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'Makefile.inc')
| -rw-r--r-- | Makefile.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Makefile.inc b/Makefile.inc index c46126af0a..355f0df76f 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -650,23 +650,23 @@ ifeq ($(CONFIG_CBFS_AUTOGEN_ATTRIBUTES),y) endif define cbfs-add-cmd - printf " CBFS $(call extract_nth,2,$(file))\n" + printf " CBFS $(call extract_nth,2,$(1))\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)) \ - -n $(call extract_nth,2,$(file)) \ - $(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)) $(1) + add$(if $(filter stage,$(call extract_nth,3,$(1))),-stage)$(if $(filter payload,$(call extract_nth,3,$(1))),-payload) \ + -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)\ + -r $(call regions-for-file,$(call extract_nth,2,$(1))) \ + $(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,-a $(call extract_nth,6,$(file))), \ - $(call 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,$(file),-a $(call extract_nth,6,$(file))), \ + $(call cbfs-add-cmd,$(file),$(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),) @@ -765,8 +765,8 @@ 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,-a $(call extract_nth,6,$(file))),\ - $(call 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,$(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)))) .PHONY: $(obj)/coreboot.pre |