x86: Fix efi directory cleanup

clean target is never called from xen/arch/x86/efi/Makefile.
Move all needed stuff to xen/arch/x86/Makefile
and additionally remove efi.lds.

Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>

diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index 0fe547b313597ae49a49f37e4f74d10f5acce2d5..d502bdf3024f93ef95dd897847a8d66018f5f997 100644 (file)
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -166,7 +166,7 @@ efi/mkreloc: efi/mkreloc.c
 
 .PHONY: clean
 clean::
-       rm -f asm-offsets.s xen.lds boot/*.o boot/*~ boot/core boot/mkelf32
+       rm -f asm-offsets.s *.lds boot/*.o boot/*~ boot/core boot/mkelf32
        rm -f $(BASEDIR)/.xen-syms.[0-9]* boot/.*.d
-       rm -f $(BASEDIR)/.xen.efi.[0-9]* efi/*.o efi/mkreloc efi/.*.d
+       rm -f $(BASEDIR)/.xen.efi.[0-9]* efi/*.o efi/.*.d efi/*.efi efi/disabled efi/mkreloc
        rm -f boot/reloc.S boot/reloc.lnk boot/reloc.bin

diff --git a/xen/arch/x86/efi/Makefile b/xen/arch/x86/efi/Makefile
index 514dba0871cfed117c4b0fdc1c1af868dc862a05..1daa7ac777db4ebc3a8a48f8b4b9d6daf4c225cc 100644 (file)
--- a/xen/arch/x86/efi/Makefile
+++ b/xen/arch/x86/efi/Makefile
@@ -12,6 +12,3 @@ efi := $(if $(efi),$(shell rm disabled)y,$(shell $(call create,boot.init.o); $(c
 extra-$(efi) += boot.init.o relocs-dummy.o runtime.o compat.o
 
 stub.o: $(extra-y)
-
-clean::
-       rm -f disabled *.efi