[coreboot-gerrit] Patch set updated for coreboot: cbootimage: Use system cbootimage if submodule is missing

Stefan Reinauer (stefan.reinauer@coreboot.org) gerrit at coreboot.org
Wed Jun 17 01:54:10 CEST 2015


Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10557

-gerrit

commit 7d31c5f840993b02f05f16122fd8d6cfeab88c0f
Author: Stefan Reinauer <stefan.reinauer at coreboot.org>
Date:   Mon Jun 15 17:32:09 2015 -0700

    cbootimage: Use system cbootimage if submodule is missing
    
    Some build environments might not have this submodule
    around, so allow them to build nvidia targets by making
    cbootimage available as a system binary.
    
    Change-Id: If9d9ac4d476e11214fe3b0ed23b2105b51e987c7
    Signed-off-by: Stefan Reinauer <stefan.reinauer at coreboot.org>
---
 util/nvidia/Makefile.inc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/util/nvidia/Makefile.inc b/util/nvidia/Makefile.inc
index 133778f..b60f715 100644
--- a/util/nvidia/Makefile.inc
+++ b/util/nvidia/Makefile.inc
@@ -1,3 +1,11 @@
+ifeq ($(wildcard util/nvidia/cbootimage/CREDITS),)
+
+$(CBOOTIMAGE): $(word 1,$(wildcard $(addsuffix /cbootimage,$(subst :, ,$(PATH)))))
+	printf "    CP         $(subst $(objutil)/,,$(@))\n"
+	cp $^ $@
+
+else
+
 # copied from cbootimage/src/Makefile.am
 CBOOTIMAGE_RAW_SRCS:= \
 	cbootimage.c \
@@ -53,3 +61,5 @@ $(CBOOTIMAGE): $(CBOOTIMAGE_OBJS)
 	printf "    HOSTCC     $(subst $(objutil)/,,$(@)) (link)\n"
 	$(HOSTCC) $(CBOOTIMAGE_FLAGS) -o $@.tmp $^ -lm
 	mv $@.tmp $@
+
+endif



More information about the coreboot-gerrit mailing list