[coreboot-gerrit] Patch set updated for coreboot: Store the payload config and revision in CBFS
Martin Roth (gaumless@gmail.com)
gerrit at coreboot.org
Thu Jun 25 16:52:22 CEST 2015
Martin Roth (gaumless at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10607
-gerrit
commit 823b6132bec8b8e54901d004d589ce059c2a4e74
Author: Martin Roth <gaumless at gmail.com>
Date: Fri Jun 19 20:50:59 2015 -0600
Store the payload config and revision in CBFS
Store the payload .config and version.c files in CBFS if using a
SeaBIOS or filo payload if INCLUDE_CONFIG_FILE is enabled.
Change-Id: I0c1b4da8f6179b9cee06cecfa76bc631b43196e0
Signed-off-by: Martin Roth <gaumless at gmail.com>
---
Makefile.inc | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/Makefile.inc b/Makefile.inc
index 2f1fe82..5ee785f 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -110,6 +110,17 @@ dir-wildcards=$(addsuffix %,$(1))
# files-in-dir,dir,files
files-in-dir=$(filter-out $(call dir-wildcards,$(call filter-out-dirs,$(1),$(sort $(dir $(2))))),$(call files-in-dir-recursive,$(1),$(2)))
+######################################################################
+# set up payload config and version files for later inclusion
+ifeq ($(CONFIG_PAYLOAD_SEABIOS),y)
+PAYLOAD_CONFIG=payloads/external/SeaBIOS/seabios/.config
+PAYLOAD_VERSION=payloads/external/SeaBIOS/seabios/out/version.c
+endif
+ifeq ($(CONFIG_PAYLOAD_FILO),y)
+PAYLOAD_CONFIG=payloads/external/FILO/filo/.config
+PAYLOAD_VERSION=payloads/external/FILO/filo/build/version.h
+endif
+
#######################################################################
# reduce command line length by linking the objects of each
# directory into an intermediate file
@@ -636,6 +647,16 @@ ifeq ($(CONFIG_CPU_MICROCODE_ADDED_DURING_BUILD),y)
$(CBFSTOOL) $@.tmp update-fit -n cpu_microcode_blob.bin -x $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES)
endif
endif
+ifeq ($(CONFIG_INCLUDE_CONFIG_FILE),y)
+ @printf " CONFIG $(PAYLOAD_CONFIG)\n"
+ if [ -f "$(PAYLOAD_CONFIG)" ]; then \
+ $(CBFSTOOL) $@.tmp add -f "$(PAYLOAD_CONFIG)" -n payload_config -t raw; \
+ fi
+ @printf " REVISION $(PAYLOAD_VERSION)\n"
+ if [ -f "$(PAYLOAD_VERSION)" ]; then \
+ $(CBFSTOOL) $@.tmp add -f "$(PAYLOAD_VERSION)" -n payload_revision -t raw; \
+ fi
+endif
mv $@.tmp $@
@printf " CBFSPRINT $(subst $(obj)/,,$(@))\n\n"
$(CBFSTOOL) $@ print
More information about the coreboot-gerrit
mailing list