[coreboot] Patch set updated: 6f25945 Add the coreboot config to CBFS

[Cristian Măgherușan-Stanciu (cristi.magherusan@gmail.com)]

Cristian Măgherușan-Stanciu (cristi.magherusan at gmail.com) just uploaded a new patch set to gerrit, which you can find at
http://review.coreboot.org/46

-gerrit

commit 6f25945813eb935b31a6f7886abd3ada9af90232
Author: Cristian Măgherușan-Stanciu <cristi.magherusan at gmail.com>
Date:   Sun Jun 19 03:03:28 2011 +0200

    Add the coreboot config to CBFS
    
    The CBFS will contain a new file, named 'config' of type 'raw' that is a
    stripped-down version of the .config file that was used to build the
    current coreboot image. For space savings, all the comments and empty
    lines were removed from the original config, except for one that lists
    the coreboot git revision that's built into the image.
    
    This is done in order to easily reproduce the work of  someone else when
    only having their ROM image. In theory the reproduce could even be
    automated by a new dedicated make target.
    
    This should work even with abuild now.
    
    Change-Id: I784989aac0227d3679d30314b06dadaec402749e
    Signed-off-by: Cristian Măgherușan-Stanciu <cristi.magherusan at gmail.com>
---
 src/Kconfig               |    6 ++++++
 src/arch/x86/Makefile.inc |    7 +++++++
 2 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/src/Kconfig b/src/Kconfig
index 9abbc21..7e6214a 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -106,6 +106,12 @@ config COMPRESS_RAMSTAGE
 	  that decompression might slow down booting if the boot flash
 	  is connected through a slow Link (i.e. SPI)
 
+config INCLUDE_CONFIG_FILE
+  bool "Include the coreboot config file into the ROM image"
+	default y
+  help
+    Include in CBFS the coreboot config file that was used to compile the ROM image
+
 endmenu
 
 source src/mainboard/Kconfig
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 8c1a887..e9c00de 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -99,6 +99,13 @@ ifeq ($(CONFIG_GEODE_VSA_FILE),y)
 	$(LD) -m elf_i386 -e 0x60020 --section-start .data=0x60000 $(obj)/vsa.o -o $(obj)/vsa.elf
 	$(CBFSTOOL) $@.tmp add-stage $(obj)/vsa.elf vsa
 endif
+ifeq ($(CONFIG_INCLUDE_CONFIG_FILE),y)
+	@printf "    CONFIG     $(DOTCONFIG)\n"
+	if [ -f $(DOTCONFIG) ]; then \
+	echo "# This image was built using git revision" `git rev-parse HEAD` > $(obj)/config.tmp ; \
+	sed -e '/^#/d' -e '/^ *$$/d' $(DOTCONFIG) >> $(obj)/config.tmp ; \
+	$(CBFSTOOL) $@.tmp add $(obj)/config.tmp config raw; rm -f $(obj)/config.tmp ; fi
+endif
 	mv $@.tmp $@
 	@printf "    CBFSPRINT  $(subst $(obj)/,,$(@))\n\n"
 	$(CBFSTOOL) $@ print