diff options
| author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-07-14 15:57:44 -0700 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-08-09 21:02:47 +0200 |
| commit | d0d487aaf481a5d1667f32eb87213cd33b80921a (patch) | |
| tree | fb4308d0441a4c149f4968cc198e976023f7ca85 | |
| parent | 2c6fe441a79af45119837cd44e111f1ebce4dec2 (diff) | |
payloads: Move payloads logic to payloads directory
Change-Id: I6437e30da6ab675d32dc81c5d6d3fd9bcdc67f06
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/10923
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
| -rw-r--r-- | Makefile.inc | 12 | ||||
| -rw-r--r-- | payloads/external/Makefile.inc | 13 |
2 files changed, 13 insertions, 12 deletions
diff --git a/Makefile.inc b/Makefile.inc index 213c56b29b..6ebf6d46b7 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -542,18 +542,6 @@ $(objcbfs)/%.elf: $(objcbfs)/%.debug ########################################################################### COREBOOT_ROM_DEPENDENCIES:= -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 extract_nth=$(patsubst -%-,%,$(word $(1), $(subst |,- -,-$(2)-))) diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 33ed47fe79..165670d7cd 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -19,6 +19,19 @@ ## Foundation, Inc. ## +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 + seabios: $(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc \ HOSTCC="$(HOSTCC)" \ |