diff options
| author | Patrick Georgi <pgeorgi@chromium.org> | 2015-11-25 18:59:54 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-11-29 13:04:18 +0100 |
| commit | 1eee076269ce0dbde1a858c67dc86665a656b004 (patch) | |
| tree | b48d55151de1d6c4ff0947d5a3f429deb24e7d22 | |
| parent | 9b5b536b1879ea7a3570b72b3f4e5776ccef2927 (diff) | |
build system: don't try to add cbfs-files with no backing file
Change-Id: Idd05a552762be92d0d93b357b96442b25a614757
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: https://review.coreboot.org/12537
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
| -rw-r--r-- | Makefile.inc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Makefile.inc b/Makefile.inc index 10b336877c..36977e034a 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -225,9 +225,11 @@ $(call add-special-class,cbfs-files) cbfs-files-handler= \ $(eval tmp-cbfs-method:=$(word 2, $(subst :, ,$($(2)-file)))) \ $(eval $(2)-file:=$(call strip_quotes,$(word 1, $(subst :, ,$($(2)-file))))) \ - $(if $(wildcard $(1)$($(2)-file)), \ - $(eval tmp-cbfs-file:= $(wildcard $(1)$($(2)-file))), \ - $(eval tmp-cbfs-file:= $($(2)-file))) \ + $(eval tmp-cbfs-file:= ) \ + $(if $($(2)-file), \ + $(if $(wildcard $(1)$($(2)-file)), \ + $(eval tmp-cbfs-file:= $(wildcard $(1)$($(2)-file))), \ + $(eval tmp-cbfs-file:= $($(2)-file)))) \ $(if $(strip $($(2)-required)), \ $(if $(wildcard $(tmp-cbfs-file)),, \ $(info This build configuration requires $($(2)-required)) \ @@ -247,7 +249,8 @@ cbfs-files-handler= \ $(eval tmp-old-cbfs-file:=$(tmp-cbfs-file)) \ $(eval tmp-cbfs-file:=$(shell mkdir -p $(obj)/mainboard/$(MAINBOARDDIR); mktemp $(obj)/mainboard/$(MAINBOARDDIR)/cbfs-file.XXXXXX).out) \ $(call cbfs-files-processor-$(tmp-cbfs-method),$(tmp-old-cbfs-file),$(tmp-cbfs-file))) \ - $(eval cbfs-files-$(_cbfs-bucket) += $(tmp-cbfs-file)|$(2)|$($(2)-type)|$($(2)-compression)|$(strip $($(2)-position))|$($(2)-align))\ + $(if $(tmp-cbfs-file), \ + $(eval cbfs-files-$(_cbfs-bucket) += $(tmp-cbfs-file)|$(2)|$($(2)-type)|$($(2)-compression)|$(strip $($(2)-position))|$($(2)-align))) \ $(eval $(2)-name:=) \ $(eval $(2)-type:=) \ $(eval $(2)-compression:=) \ |