Patrick Georgi (pgeorgi@google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12648
-gerrit
commit 60113bba517cc20ba8dab6072e57282f841a785a Author: Patrick Georgi pgeorgi@chromium.org Date: Fri Dec 4 17:45:19 2015 +0100
build system: Drop useless variable and dependency
We don't need COREBOOT_ROM_DEPENDENCIES anymore because the dependencies are taken care of by the cbfs-files mechanism. REFCODE_BLOB also doesn't need to be an explicit dependency.
Change-Id: I3f32cce79683e57a174724179bc2ac59a8cdda94 Signed-off-by: Patrick Georgi pgeorgi@chromium.org --- Makefile.inc | 4 +--- payloads/external/Makefile.inc | 13 ------------- 2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/Makefile.inc b/Makefile.inc index 4bccefb..6a553fb 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -599,8 +599,6 @@ $(objcbfs)/%.elf: $(objcbfs)/%.debug # Build the final rom image ###########################################################################
-COREBOOT_ROM_DEPENDENCIES:= - extract_nth=$(subst *,$(spc),$(patsubst -%-,%,$(word $(1), $(subst |,- -,-$(2)-))))
cbfs-add-cmd = \ @@ -658,7 +656,7 @@ $(REFCODE_BLOB): $(RMODTOOL) $(RMODTOOL) -i $(CONFIG_REFCODE_BLOB_FILE) -o $@ endif
-$(obj)/coreboot.rom: $(obj)/coreboot.pre $(objcbfs)/ramstage.elf $(CBFSTOOL) $$(call strip_quotes,$$(COREBOOT_ROM_DEPENDENCIES)) $$(INTERMEDIATE) $(REFCODE_BLOB) +$(obj)/coreboot.rom: $(obj)/coreboot.pre $(objcbfs)/ramstage.elf $(CBFSTOOL) $$(INTERMEDIATE) @printf " CBFS $(subst $(obj)/,,$(@))\n" # The full ROM may be larger than the CBFS part, so create an empty # file (filled with \377 = 0xff) and copy the CBFS image over it. diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 47a4964..d15c398 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -15,19 +15,6 @@ ## GNU General Public License for more details. ##
-ifeq ($(CONFIG_PAYLOAD_ELF),y) -COREBOOT_ROM_DEPENDENCIES+=$(CONFIG_PAYLOAD_FILE) -endif -ifeq ($(CONFIG_PAYLOAD_SEABIOS),y) -COREBOOT_ROM_DEPENDENCIES+=seabios -endif -ifeq ($(CONFIG_PAYLOAD_FILO),y) -COREBOOT_ROM_DEPENDENCIES+=filo -endif -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)