GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Patrick Georgi 2015-11-25 18:59:54 +01:00 committed by Patrick Georgi
parent 9b5b536b18
commit 1eee076269
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile.inc
View File

@ -225,9 +225,11 @@ $(call add-special-class,cbfs-files)
cbfs-files-handler= \ cbfs-files-handler= \
$(eval tmp-cbfs-method:=$(word 2, $(subst :, ,$($(2)-file)))) \ $(eval tmp-cbfs-method:=$(word 2, $(subst :, ,$($(2)-file)))) \
$(eval $(2)-file:=$(call strip_quotes,$(word 1, $(subst :, ,$($(2)-file))))) \ $(eval $(2)-file:=$(call strip_quotes,$(word 1, $(subst :, ,$($(2)-file))))) \
$(if $(wildcard $(1)$($(2)-file)), \ $(eval tmp-cbfs-file:= ) \
$(eval tmp-cbfs-file:= $(wildcard $(1)$($(2)-file))), \ $(if $($(2)-file), \
$(eval tmp-cbfs-file:= $($(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 $(strip $($(2)-required)), \
$(if $(wildcard $(tmp-cbfs-file)),, \ $(if $(wildcard $(tmp-cbfs-file)),, \
$(info This build configuration requires $($(2)-required)) \ $(info This build configuration requires $($(2)-required)) \
@ -247,7 +249,8 @@ cbfs-files-handler= \
$(eval tmp-old-cbfs-file:=$(tmp-cbfs-file)) \ $(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) \ $(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))) \ $(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)-name:=) \
$(eval $(2)-type:=) \ $(eval $(2)-type:=) \
$(eval $(2)-compression:=) \ $(eval $(2)-compression:=) \