diff options
| author | Patrick Georgi <pgeorgi@chromium.org> | 2015-12-04 17:45:19 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-12-05 16:06:34 +0100 |
| commit | ec90adb2e71b9e654cc1007143aa450c3996b4a8 (patch) | |
| tree | 5ec14dd1032ab0f23afdad0778eca65fb1877b09 | |
| parent | 762cdfaaa0535b622144ad7f8215937f5aac5451 (diff) | |
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>
Reviewed-on: https://review.coreboot.org/12648
Tested-by: build bot (Jenkins)
Reviewed-by: Alexander Couzens <lynxis@fe80.eu>
| -rw-r--r-- | Makefile.inc | 4 | ||||
| -rw-r--r-- | payloads/external/Makefile.inc | 13 |
2 files changed, 1 insertions, 16 deletions
diff --git a/Makefile.inc b/Makefile.inc index 4bccefb795..6a553fb6fa 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 47a496427b..d15c398053 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) |