summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.inc10
-rw-r--r--payloads/external/Makefile.inc11
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 \