From 679755778bdffe2c384eaa390132f3e5cab96a76 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Mon, 7 Mar 2016 16:38:52 -0700 Subject: [PATCH] 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 Reviewed-on: https://review.coreboot.org/13940 Tested-by: build bot (Jenkins) Reviewed-by: Ben Gardner Reviewed-by: Paul Menzel --- Makefile | 3 ++- Makefile.inc | 4 +--- payloads/Makefile.inc | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 6b4edbbcee..4380d97569 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 ce6f3514a7..5f4725d5e6 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -449,7 +449,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 @@ -458,8 +458,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 1bd8cf72bb..4269715a72 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