Patrick Georgi (pgeorgi@google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12550
-gerrit
commit 20c7a9bfbd45268cf2a0542148f89fc0a37da7f6 Author: Patrick Georgi pgeorgi@chromium.org Date: Thu Nov 26 17:22:38 2015 +0100
build system: drop one level of indirection
coreboot.pre1 was generated then copied into coreboot.pre, now without any additional manipulation. Get rid of that extra step.
Change-Id: I138567cadbc2fa1a6b6c988e34bdaae0e92d5554 Signed-off-by: Patrick Georgi pgeorgi@chromium.org --- Makefile.inc | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/Makefile.inc b/Makefile.inc index 3942197..9aceb18 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -613,7 +613,7 @@ prebuild-files = \ $(cbfs-add-cmd) $(if $(call extract_nth,5,$(file)),-b $(call extract_nth,5,$(file))) &&)) prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))
-$(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(FMAPTOOL) $(CBFSTOOL) $$(cpu_ucode_cbfs_file) +$(obj)/coreboot.pre: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(FMAPTOOL) $(CBFSTOOL) $$(cpu_ucode_cbfs_file) $(CBFSTOOL) $@.tmp create \ -B $(objcbfs)/bootblock.bin \ $(CBFSTOOL_PRE1_OPTS) @@ -629,8 +629,8 @@ prebuild-files = \ $(if $(call extract_nth,6,$(file)),$(cbfs-add-cmd) -a $(call extract_nth,6,$(file)) &&,\ $(cbfs-add-cmd) $(if $(call extract_nth,5,$(file)),-b $(call extract_nth,5,$(file))) &&)))
-.PHONY: $(obj)/coreboot.pre1 -$(obj)/coreboot.pre1: $$(prebuilt-files) $(CBFSTOOL) +.PHONY: $(obj)/coreboot.pre +$(obj)/coreboot.pre: $$(prebuilt-files) $(CBFSTOOL) mv $(obj)/coreboot.rom $@.tmp $(prebuild-files) true mv $@.tmp $@ @@ -741,11 +741,6 @@ cbfs-files-$(CONFIG_BOOTSPLASH_IMAGE) += bootsplash.jpg bootsplash.jpg-file := $(call strip_quotes,$(CONFIG_BOOTSPLASH_FILE)) bootsplash.jpg-type := bootsplash
-$(obj)/coreboot.pre: $(objcbfs)/romstage.elf $(obj)/coreboot.pre1 $(CBFSTOOL) - @printf " CBFS $(subst $(obj)/,,$(@))\n" - cp $(obj)/coreboot.pre1 $@.tmp - mv $@.tmp $@ - cbfs-files-$(CONFIG_BOARD_ID_MANUAL) += board_id board_id-file := $(obj)/board_id board_id-type := raw