diff options
| author | Cristian Măgherușan-Stanciu <cristi.magherusan@gmail.com> | 2011-06-19 03:03:28 +0200 |
|---|---|---|
| committer | Marc Jones <marcj303@gmail.com> | 2011-06-22 06:43:23 +0200 |
| commit | d367b00c5b2f05644e3fae41d4d560720e58cc38 (patch) | |
| tree | 26f96bd79aa64182cd44f70f1c89ebf5e12e99a7 | |
| parent | 621ca384a7a5efb2cc7597504dc17b741cd2df10 (diff) | |
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@gmail.com>
Reviewed-on: http://review.coreboot.org/46
Tested-by: build bot (Jenkins)
Reviewed-by: Marc Jones <marcj303@gmail.com>
| -rw-r--r-- | src/Kconfig | 6 | ||||
| -rw-r--r-- | src/arch/x86/Makefile.inc | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/Kconfig b/src/Kconfig index 9abbc2169d..7e6214a499 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 8c1a8878f8..e9c00deac3 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 |