build system: Initialize all CBFS regions
Regions marked "(CBFS)" in the fmd weren't actually initialized with a CBFS structure, just the default CBFS region (COREBOOT). This made cbfstool add (etc) fail on those regions, so explicitly initialize all those regions. Change-Id: Ib321fa73cd2ecc8057b52408521fd214d6df7f2e Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Reviewed-on: https://review.coreboot.org/13059 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
parent
c3771b0f8f
commit
bdaa1b5a72
|
@ -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 \
|
||||
|
|
Loading…
Reference in New Issue