[coreboot-gerrit] New patch to review for coreboot: payloads/external/Makefile.inc: Clean up targets

[Martin Roth (martinroth@google.com)]

Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17047

-gerrit

commit f816ba3092c567d47aa37312628bbea98f507c56
Author: Martin Roth <martinroth at google.com>
Date:   Mon Oct 17 10:21:17 2016 -0600

    payloads/external/Makefile.inc: Clean up targets
    
    - Combine the short target name with the filename.
    - All targets depend on top level dotconfig.
    - Payload targets depend on their payload .config.
    - Add .PHONY target for the short target names.
    - Add additional short target names grub, uboot, and memtest.
    - Remove reversed dependencies of config files on the output.
    
    This fixes an issue with SeaBIOS and Filo rebuilding every time.
    
    Change-Id: Ied3b4ea7edfd3b4183ff788f57f484c462b63b5b
    Signed-off-by: Martin Roth <martinroth at google.com>
---
 payloads/external/Makefile.inc | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 9f05abd..7d72ec7 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -60,10 +60,12 @@ cbfs-files-$(CONFIG_INCLUDE_CONFIG_FILE) += payload_revision
 payload_revision-file := $(PAYLOAD_VERSION)
 payload_revision-type := raw
 
+.PHONY: seabios depthcharge grub2 grub tint memtest u-boot uboot ipxe
+
 # SeaBIOS
 
 SEABIOS_CC_OFFSET=$(if $(filter %ccache,$(HOSTCC)),2,1)
-payloads/external/SeaBIOS/seabios/out/bios.bin.elf seabios: $(DOTCONFIG)
+payloads/external/SeaBIOS/seabios/out/bios.bin.elf seabios: $(DOTCONFIG) $(PAYLOAD_CONFIG)
 	$(MAKE) -C payloads/external/SeaBIOS \
 			HOSTCC="$(HOSTCC)" \
 			CC=$(word $(SEABIOS_CC_OFFSET),$(CC_x86_32)) \
@@ -84,8 +86,6 @@ payloads/external/SeaBIOS/seabios/out/bios.bin.elf seabios: $(DOTCONFIG)
 			CONFIG_TTYS0_BASE=$(CONFIG_TTYS0_BASE)
 
 payloads/external/SeaBIOS/seabios/out/vgabios.bin: seabios
-payloads/external/SeaBIOS/seabios/.config: payloads/external/SeaBIOS/seabios/out/bios.bin.elf
-payloads/external/SeaBIOS/seabios/out/autoversion.h: payloads/external/SeaBIOS/seabios/out/bios.bin.elf
 
 # add a SeaBIOS bootorder file
 ifneq ($(strip $(CONFIG_SEABIOS_BOOTORDER_FILE)),)
@@ -94,16 +94,16 @@ bootorder-file := $(strip $(CONFIG_SEABIOS_BOOTORDER_FILE))
 bootorder-type := raw
 endif
 
-payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(DOTCONFIG) $(CBFSTOOL)
 # Depthcharge
 
+payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(DOTCONFIG) $(CBFSTOOL) $(PAYLOAD_CONFIG)
 	$(MAKE) -C payloads/external/depthcharge \
 		BOARD=$(call ws_to_under,$(call strip_quotes,$(call tolower,$(CONFIG_MAINBOARD_PART_NUMBER)))) \
 		MFLAGS= MAKEFLAGS=
 
-filo:
 # FILO
 
+payloads/external/FILO/filo/build/filo.elf filo: $(DOTCONFIG) $(PAYLOAD_CONFIG)
 	$(MAKE) -C payloads/external/FILO \
 			HOSTCC="$(HOSTCC)" \
 			CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_x86_32)" \
@@ -111,12 +111,9 @@ filo:
 			CONFIG_FILO_MASTER=$(CONFIG_FILO_MASTER) \
 			CONFIG_FILO_STABLE=$(CONFIG_FILO_STABLE)
 
-payloads/external/FILO/filo/build/filo.elf: filo
-payloads/external/FILO/filo/.config: filo
-payloads/external/FILO/filo/build/version.h: filo
 # Grub
 
-grub2:
+payloads/external/GRUB2/grub2/build/default_payload.elf grub2 grub: $(DOTCONFIG) 
 	$(MAKE) -C payloads/external/GRUB2 \
 			HOSTCC="$(HOSTCC)" \
 			CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_x86_32)" \
@@ -124,10 +121,9 @@ grub2:
 			CONFIG_GRUB2_MASTER=$(CONFIG_GRUB2_MASTER) \
 			CONFIG_GRUB2_EXTRA_MODULES=$(CONFIG_GRUB2_EXTRA_MODULES)
 
-payloads/external/GRUB2/grub2/build/default_payload.elf: grub2
 # U-Boot
 
-payloads/external/U-Boot/u-boot/u-boot-dtb.bin u-boot: $(DOTCONFIG)
+payloads/external/U-Boot/u-boot/u-boot-dtb.bin u-boot uboot: $(DOTCONFIG)
 	$(MAKE) -C payloads/external/U-Boot \
 			CONFIG_UBOOT_MASTER=$(CONFIG_UBOOT_MASTER) \
 			CONFIG_UBOOT_STABLE=$(CONFIG_UBOOT_STABLE)
@@ -153,7 +149,7 @@ ifeq ($(CONFIG_CONSOLE_SERIAL)$(CONFIG_DRIVERS_UART_8250IO),yy)
 		SERIAL_BAUD_RATE=$(CONFIG_TTYS0_BAUD)
 endif
 
-payloads/external/Memtest86Plus/memtest86plus/memtest: $(DOTCONFIG)
+payloads/external/Memtest86Plus/memtest86plus/memtest memtest: $(DOTCONFIG)
 	$(MAKE) -C payloads/external/Memtest86Plus all \
 		CC="$(CC_x86_32)" \
 		LD="$(LD_x86_32)" \