[coreboot-gerrit] Patch set updated for coreboot: Makefile: Update payload clean 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/13940

-gerrit

commit fdf228c0d67c3f15aa4e7fc32b407331b355ac1b
Author: Martin Roth <martinroth at google.com>
Date:   Mon Mar 7 16:38:52 2016 -0700

    Makefile: Update payload clean targets
    
    Move payload clean targets into payloads/Makefile.inc
    Add clean targets for coreinfo, nvramcui, Memtest86+
    
    Change-Id: I70c13582311dfba3e309805053159f8a039cb109
    Signed-off-by: Martin Roth <martinroth at google.com>
---
 Makefile              |  3 ++-
 Makefile.inc          |  4 +---
 payloads/Makefile.inc | 17 +++++++++++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 6b4edbb..4380d97 100644
--- a/Makefile
+++ b/Makefile
@@ -132,6 +132,7 @@ endif
 
 ifeq ($(NOCOMPILE),1)
 include $(TOPLEVEL)/Makefile.inc
+include $(TOPLEVEL)/payloads/Makefile.inc
 real-all: config
 
 else
@@ -321,7 +322,7 @@ clean-cscope:
 clean-ctags:
 	rm -f tags
 
-distclean: clean clean-ctags clean-cscope
+distclean: clean clean-ctags clean-cscope distclean-payloads
 	rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig* .ccwrap .xcompile
 
 .PHONY: $(PHONY) clean clean-for-update clean-cscope cscope distclean doxygen doxy doxygen_simple
diff --git a/Makefile.inc b/Makefile.inc
index 7ed229e..bde7d15 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -445,7 +445,7 @@ $(objgenerated)/libverstage.a: $$(libverstage-objs)
 clean-abuild:
 	rm -rf coreboot-builds
 
-clean-for-update-target:
+clean-for-update-target: clean-payloads
 	rm -f $(obj)/ramstage?* $(obj)/coreboot.romstage $(obj)/coreboot.pre* $(obj)/coreboot.bootblock $(obj)/coreboot.a
 	rm -rf $(obj)/bootblock?* $(obj)/romstage?* $(obj)/location.*
 	rm -f $(obj)/option_table.* $(obj)/crt0.S $(obj)/ldscript
@@ -454,8 +454,6 @@ clean-for-update-target:
 	rm -f $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc
 	rm -f $(obj)/mainboard/$(MAINBOARDDIR)/bootblock.* $(obj)/dsdt.*
 	rm -f $(obj)/cpu/x86/smm/smm_bin.c $(obj)/cpu/x86/smm/smm.* $(obj)/cpu/x86/smm/smm
-	$(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc clean
-	$(MAKE) -C payloads/external/U-Boot -f Makefile.inc clean
 
 clean-target:
 	rm -f $(obj)/coreboot*
diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc
index 1bd8cf7..4269715 100644
--- a/payloads/Makefile.inc
+++ b/payloads/Makefile.inc
@@ -19,3 +19,20 @@ img/coreinfo-type := payload
 
 payloads/coreinfo/build/coreinfo.elf coreinfo:
 	$(MAKE) -C payloads/coreinfo defaultbuild
+
+clean-payloads:
+	$(MAKE) -C payloads/coreinfo clean
+	$(MAKE) -C payloads/libpayload clean
+	$(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc clean
+	$(MAKE) -C payloads/external/U-Boot -f Makefile.inc clean
+	$(MAKE) -C payloads/external/Memtest86Plus -f Makefile.inc clean
+
+
+distclean-payloads:
+	$(MAKE) -C payloads/coreinfo distclean
+	$(MAKE) -C payloads/libpayload distclean
+	$(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc distclean
+	$(MAKE) -C payloads/external/U-Boot -f Makefile.inc distclean
+	$(MAKE) -C payloads/external/Memtest86Plus -f Makefile.inc distclean
+
+.phony: clean-payloads distclean-payloads