Stefan Reinauer (stefan.reinauer@coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10923
-gerrit
commit 47d3bbebcc832f3ae933e37fbeb486dea1dea50f Author: Stefan Reinauer stefan.reinauer@coreboot.org Date: Tue Jul 14 15:57:44 2015 -0700
payloads: Move payloads logic to payloads directory
Change-Id: I6437e30da6ab675d32dc81c5d6d3fd9bcdc67f06 Signed-off-by: Stefan Reinauer stefan.reinauer@coreboot.org --- Makefile.inc | 12 ------------ payloads/external/Makefile.inc | 13 +++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/Makefile.inc b/Makefile.inc index 347e07b..b402155 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 33ed47f..165670d 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)" \