[coreboot-gerrit] New patch to review for coreboot: SeaBIOS: Store the .config and revision in CBFS

[Martin Roth (gaumless@gmail.com)]

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 00e016d2884f77b5e1c7777644918b57925123a0
Author: Martin Roth <gaumless at gmail.com>
Date:   Fri Jun 19 20:50:59 2015 -0600

    SeaBIOS: Store the .config and revision in CBFS
    
    Add a Kconfig option to store the SeaBIOS .config and version.c files
    into CBFS if using a SeaBIOS payload.  This defaults to disabled if
    using SEABIOS_STABLE, because the coreboot version specifies everything
    needed to rebuild that.  For SeaBIOS master, the version changes, and
    for User-managed builds, both the config and version are needed.
    
    Change-Id: I0c1b4da8f6179b9cee06cecfa76bc631b43196e0
    Signed-off-by: Martin Roth <gaumless at gmail.com>
---
 Makefile.inc | 7 +++++++
 src/Kconfig  | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/Makefile.inc b/Makefile.inc
index b5acdd0..a1874d7 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -629,6 +629,13 @@ 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_SEABIOS_INCLUDE_CONFIG_FILE),y)
+	@printf "    CONFIG     payloads/external/SeaBIOS/seabios/.config\n"
+	if [ -f payloads/external/SeaBIOS/seabios/.config ]; then \
+	$(CBFSTOOL) $@.tmp add -f payloads/external/SeaBIOS/seabios/.config -n seabios_config -t raw ; fi
+	@printf "    REVISION   payloads/external/SeaBIOS/seabios/out/version.c\n"
+	if [ -f payloads/external/SeaBIOS/seabios/out/version.c ]; then $(CBFSTOOL) $@.tmp add -f payloads/external/SeaBIOS/seabios/out/version.c -n seabios_revision -t raw; fi
+endif
 	mv $@.tmp $@
 	@printf "    CBFSPRINT  $(subst $(obj)/,,$(@))\n\n"
 	$(CBFSTOOL) $@ print
diff --git a/src/Kconfig b/src/Kconfig
index d4e0012..1c07988 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -771,6 +771,15 @@ config SEABIOS_VGA_COREBOOT
 	  After initializing the GPU, the information about it can be passed to the payload.
 	  Provide an option rom that implements this legacy VGA BIOS compatibility requirement.
 
+config SEABIOS_INCLUDE_CONFIG_FILE
+	bool "Include SeaBIOS .config and version.c in CBFS" if PAYLOAD_SEABIOS
+	depends on !SEABIOS_STABLE
+	default INCLUDE_CONFIG_FILE
+	help
+	  Similar to storing the coreboot .config and build.h files in CBFS,
+	  this stores the SeaBIOS .config and version.c files into CBFS so it's
+	  easier to see what version and options were used to create the image.
+
 choice
 	prompt "GRUB2 version"
 	default GRUB2_MASTER