Aaron Durbin (adurbin@chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10410
-gerrit
commit 85572ee56d59a48949a578781da678c48c2086e5 Author: Aaron Durbin adurbin@chromium.org Date: Wed Jun 3 11:54:59 2015 -0500
update_image: add all CBFS_PREFIX files to cbfs
In order to accomodate objects not directly linked into ramstage anymore those files need to be added to the image when UPDATE_IMAGE is selected. Otherwise many required pieces are missing from booting correctly.
Change-Id: Ic0b24387d24d0af3b75f5fd6fa1795fd381c4d58 Signed-off-by: Aaron Durbin adurbin@chromium.org --- Makefile.inc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/Makefile.inc b/Makefile.inc index d5ef301..f07e8cd 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -552,9 +552,18 @@ $(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(FMAPTOOL) $( $(call add-cpu-microcode-to-cbfs,$@.tmp) mv $@.tmp $@ else +prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file))) +prebuild-files = \ + $(foreach file,$(filter $(CONFIG_CBFS_PREFIX)/%, $(cbfs-files)), \ + $(if $(call extract_nth,6,$(file)),$(CBFSTOOL) $@.tmp locate -f $(call extract_nth,1,$(file)) -n $(call extract_nth,2,$(file)) -a $(call extract_nth,6,$(file))|xargs -i \ + $(cbfs-add-cmd) -b {} &&,\ + $(cbfs-add-cmd) $(if $(call extract_nth,5,$(file)),-b $(call extract_nth,5,$(file))) &&)) + .PHONY: $(obj)/coreboot.pre1 -$(obj)/coreboot.pre1: $(CBFSTOOL) - mv $(obj)/coreboot.rom $@ +$(obj)/coreboot.pre1: $$(prebuilt-files) $(CBFSTOOL) + mv $(obj)/coreboot.rom $@.tmp + $(prebuild-files) true + mv $@.tmp $@ endif
ifeq ($(CONFIG_PAYLOAD_LINUX),y)