diff options
| author | Martin Roth <gaumless@gmail.com> | 2015-06-19 20:50:59 -0600 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2015-08-19 15:52:22 +0000 |
| commit | 7b928cd0c365f60bc9d60aa0da0aa2d8782bb5b1 (patch) | |
| tree | 5e2fb32e94620c88acd1655646aa30387c660f86 | |
| parent | 188e37072fbd79a7a947a903f9918a49f32a08d6 (diff) | |
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>
Reviewed-on: http://review.coreboot.org/10607
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins)
| -rw-r--r-- | Makefile.inc | 10 | ||||
| -rw-r--r-- | payloads/external/Makefile.inc | 11 |
2 files changed, 21 insertions, 0 deletions
diff --git a/Makefile.inc b/Makefile.inc index 7f5563a25e..1cac01b47c 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -647,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 diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 6cdb412afb..4bda38a151 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 \ |