[PATCH 0/2] x86/build: clean-up 'archprepare' and 'archclean'

[PATCH 0/2] x86/build: clean-up 'archprepare' and 'archclean'

[Masahiro Yamada]

Clean-up from the build system point of view.

The archpreapre and archclean for the x86 purgatory are unnecessary.
Kbuild can handle them in a normal way.


Masahiro Yamada (2):
  Revert "kexec: purgatory: add clean-up for purgatory directory"
  x86/build: remove unnecessary preparation for purgatory

 arch/x86/Makefile | 6 ------
 1 file changed, 6 deletions(-)

-- 
2.7.4

[PATCH 1/2] Revert "kexec: purgatory: add clean-up for purgatory directory"

[Masahiro Yamada]

This reverts commit b0108f9e93d0d39050eaa11358852f349bdccb71.

Commit b0108f9e93d0 ("kexec: purgatory: add clean-up for purgatory
directory") stated that the kexec-purgatory.c and purgatory.ro files
were not removed after make mrproper.

In fact, they are.  You can confirm it after reverting it.

  $ make mrproper
  $ touch arch/x86/purgatory/kexec-purgatory.c
  $ touch arch/x86/purgatory/purgatory.ro
  $ make mrproper
    CLEAN   arch/x86/purgatory
  $ ls arch/x86/purgatory/
  entry64.S  Makefile  purgatory.c  setup-x86_64.S  stack.S  string.c

This is obvious from the build system point of view.

arch/x86/Makefile adds 'arch/x86' to core-y.
Hence 'make clean' descends like this:

  arch/x86/Kbuild
    -> arch/x86/purgatory/Makefile

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 arch/x86/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index f0a6ea2..246a979 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -327,7 +327,6 @@ archclean:
 	$(Q)rm -rf $(objtree)/arch/x86_64
 	$(Q)$(MAKE) $(clean)=$(boot)
 	$(Q)$(MAKE) $(clean)=arch/x86/tools
-	$(Q)$(MAKE) $(clean)=arch/x86/purgatory
 
 define archhelp
   echo  '* bzImage      - Compressed kernel image (arch/x86/boot/bzImage)'
-- 
2.7.4

[PATCH 2/2] x86/build: remove unnecessary preparation for purgatory

[Masahiro Yamada]

kexec-purgatory.c is properly generated when Kbuild descend into
the arch/x86/purgatory/.

The archprepare target is redundant.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 arch/x86/Makefile | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 246a979..a08e828 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -258,11 +258,6 @@ archscripts: scripts_basic
 archheaders:
 	$(Q)$(MAKE) $(build)=arch/x86/entry/syscalls all
 
-archprepare:
-ifeq ($(CONFIG_KEXEC_FILE),y)
-	$(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
-endif
-
 ###
 # Kernel objects
 
-- 
2.7.4