[coreboot-gerrit] Patch set updated for coreboot: build system: Initialize all CBFS regions
Patrick Georgi (pgeorgi@google.com)
gerrit at coreboot.org
Thu Jan 21 15:19:18 CET 2016
Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13059
-gerrit
commit 2f25a43e4c98f5a0ce76ed99a4fef758712dbb70
Author: Patrick Georgi <pgeorgi at chromium.org>
Date: Wed Jan 20 15:32:03 2016 +0100
build system: Initialize all CBFS regions
Change-Id: Ib321fa73cd2ecc8057b52408521fd214d6df7f2e
Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
---
Makefile.inc | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Makefile.inc b/Makefile.inc
index b1f5595..23cc079 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -719,13 +719,14 @@ endif
# generated at the same time as fmap.fmap
$(obj)/fmap.h: $(obj)/fmap.fmap
+$(obj)/fmap.desc: $(obj)/fmap.fmap
$(obj)/fmap.fmap: $(obj)/fmap.fmd $(FMAPTOOL)
echo " FMAP $(FMAPTOOL) -h $(obj)/fmap.h $< $@"
- $(FMAPTOOL) -h $(obj)/fmap.h $< $@
+ $(FMAPTOOL) -h $(obj)/fmap.h -R $(obj)/fmap.desc $< $@
-$(obj)/coreboot.pre: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL) $$(cpu_ucode_cbfs_file) $(obj)/fmap.fmap
- $(CBFSTOOL) $@.tmp create -M $(obj)/fmap.fmap
+$(obj)/coreboot.pre: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL) $$(cpu_ucode_cbfs_file) $(obj)/fmap.fmap $(obj)/fmap.desc
+ $(CBFSTOOL) $@.tmp create -M $(obj)/fmap.fmap -r $(shell cat $(obj)/fmap.desc)
ifeq ($(CONFIG_ARCH_X86),y)
$(CBFSTOOL) $@.tmp add \
-f $(objcbfs)/bootblock.bin \
More information about the coreboot-gerrit
mailing list