Martin Roth (martinroth@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10607
-gerrit
commit aba53f2acf516cfc8a36fbe97910f274bb73ae99 Author: Martin Roth gaumless@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 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@gmail.com --- Makefile.inc | 10 ++++++++++ payloads/external/Makefile.inc | 11 +++++++++++ 2 files changed, 21 insertions(+)
diff --git a/Makefile.inc b/Makefile.inc index 1f74bbe..ad421b7 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -645,6 +645,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 diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index ad1a3ef..f80e420 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -32,6 +32,17 @@ ifeq ($(CONFIG_PAYLOAD_GRUB2),y) COREBOOT_ROM_DEPENDENCIES+=grub2 endif
+###################################################################### +# 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 + SEABIOS_CC_OFFSET=$(if $(filter %ccache,$(HOSTCC)),2,1) seabios: $(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc \