kbuild: use more subdir- for visiting subdirectories while cleaning

Documentation/kbuild/makefiles.rst suggests to use "archclean" for
cleaning arch/$(SRCARCH)/boot/, but it is not a hard requirement.

Since commit d92cc4d51643 ("kbuild: require all architectures to have
arch/$(SRCARCH)/Kbuild"), we can use the "subdir- += boot" trick for
all architectures. This can take advantage of the parallel option (-j)
for "make clean".

I also cleaned up the comments in arch/$(SRCARCH)/Makefile. The "archdep"
target no longer exists.

Signed-off-by: Masahiro Yamada <[email protected]>
Reviewed-by: Kees Cook <[email protected]>
Acked-by: Geert Uytterhoeven <[email protected]>
Acked-by: Michael Ellerman <[email protected]> (powerpc)

diff --git a/Documentation/kbuild/makefiles.rst b/Documentation/kbuild/makefiles.rst
index db3af0b45bafa7872f54a3b5fd91753396ea89a6..b008b90b92c9fcb279a4e08ad2e3763ab67091a3 100644 (file)
--- a/Documentation/kbuild/makefiles.rst
+++ b/Documentation/kbuild/makefiles.rst
@@ -1050,22 +1050,9 @@ is not sufficient this sometimes needs to be explicit.
 The above assignment instructs kbuild to descend down in the
 directory compressed/ when "make clean" is executed.
 
-To support the clean infrastructure in the Makefiles that build the
-final bootimage there is an optional target named archclean:
-
-       Example::
-
-               #arch/x86/Makefile
-               archclean:
-                       $(Q)$(MAKE) $(clean)=arch/x86/boot
-
-When "make clean" is executed, make will descend down in arch/x86/boot,
-and clean as usual. The Makefile located in arch/x86/boot/ may use
-the subdir- trick to descend further down.
-
 Note 1: arch/$(SRCARCH)/Makefile cannot use "subdir-", because that file is
-included in the top level makefile, and the kbuild infrastructure
-is not operational at that point.
+included in the top level makefile. Instead, arch/$(SRCARCH)/Kbuild can use
+"subdir-".
 
 Note 2: All directories listed in core-y, libs-y, drivers-y and net-y will
 be visited during "make clean".

diff --git a/arch/alpha/Kbuild b/arch/alpha/Kbuild
index c2302017403a9de90195ad1281809eef9c210c77..345d79df24bb99856e27eda600c053efcc912bca 100644 (file)
--- a/arch/alpha/Kbuild
+++ b/arch/alpha/Kbuild
@@ -1,3 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 obj-y                  += kernel/ mm/
 obj-$(CONFIG_MATHEMU)  += math-emu/
+
+# for cleaning
+subdir- += boot

diff --git a/arch/alpha/Makefile b/arch/alpha/Makefile
index 52529ee42dac9d5689e4caf2a2b219be71b685eb..881cb913e23abbc416ffdee4e744334d0d989955 100644 (file)
--- a/arch/alpha/Makefile
+++ b/arch/alpha/Makefile
@@ -55,9 +55,6 @@ $(boot)/vmlinux.gz: vmlinux
 bootimage bootpfile bootpzfile: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
-archclean:
-       $(Q)$(MAKE) $(clean)=$(boot)
-
 archheaders:
        $(Q)$(MAKE) $(build)=arch/alpha/kernel/syscalls all
 

diff --git a/arch/arc/Kbuild b/arch/arc/Kbuild
index 699d8cae9b1fcd4876b9580efd81d37c624f135b..b94102fff68b454ceadfa7b87b2c49d512fdcf79 100644 (file)
--- a/arch/arc/Kbuild
+++ b/arch/arc/Kbuild
@@ -1,3 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-y += kernel/
 obj-y += mm/
+
+# for cleaning
+subdir- += boot

diff --git a/arch/arc/Makefile b/arch/arc/Makefile
index 8782a03f24a8e6f974e0d681d5ebc9c4c594781e..f252e7b924e96229a419cb84a010701880257320 100644 (file)
--- a/arch/arc/Makefile
+++ b/arch/arc/Makefile
@@ -112,6 +112,3 @@ uImage: $(uimage-default-y)
        @$(kecho) '  Image $(boot)/uImage is ready'
 
 CLEAN_FILES += $(boot)/uImage
-
-archclean:
-       $(Q)$(MAKE) $(clean)=$(boot)

diff --git a/arch/arm/Kbuild b/arch/arm/Kbuild
index 5208f7061524bf957e666bd68cc9134eeccd492c..b506622e7e23a50311fe3a41dc01861025163236 100644 (file)
--- a/arch/arm/Kbuild
+++ b/arch/arm/Kbuild
@@ -9,3 +9,6 @@ obj-y                           += kernel/ mm/ common/
 obj-y                          += probes/
 obj-y                          += net/
 obj-y                          += crypto/
+
+# for cleaning
+subdir- += boot

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 847c31e7c36870602a7ed5906f76402f8aa57eed..07ea71f8665caf96b7216428e3926decc91f75de 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -317,10 +317,6 @@ ifeq ($(CONFIG_VDSO),y)
        $(Q)$(MAKE) $(build)=arch/arm/vdso $@
 endif
 
-# We use MRPROPER_FILES and CLEAN_FILES now
-archclean:
-       $(Q)$(MAKE) $(clean)=$(boot)
-
 # My testing targets (bypasses dependencies)
 bp:;   $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/bootpImage
 

diff --git a/arch/arm64/Kbuild b/arch/arm64/Kbuild
index ea7ab4ca81f92dea6dc94948d6a3c187b65d826d..5bfbf7d79c99bec11d19b3551600318af2c07023 100644 (file)
--- a/arch/arm64/Kbuild
+++ b/arch/arm64/Kbuild
@@ -4,3 +4,6 @@ obj-$(CONFIG_KVM)       += kvm/
 obj-$(CONFIG_XEN)      += xen/
 obj-$(subst m,y,$(CONFIG_HYPERV))      += hyperv/
 obj-$(CONFIG_CRYPTO)   += crypto/
+
+# for cleaning
+subdir- += boot

diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index c744b1e7b3569773af6d4a0a074d5883725a9922..e8cfc5868aa8eefb5d5ae91e0f79a75044085733 100644 (file)
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -182,13 +182,6 @@ ifeq ($(CONFIG_ARM64_USE_LSE_ATOMICS),y)
   endif
 endif
 
-
-# We use MRPROPER_FILES and CLEAN_FILES now
-archclean:
-       $(Q)$(MAKE) $(clean)=$(boot)
-       $(Q)$(MAKE) $(clean)=arch/arm64/kernel/vdso
-       $(Q)$(MAKE) $(clean)=arch/arm64/kernel/vdso32
-
 ifeq ($(KBUILD_EXTMOD),)
 # We need to generate vdso-offsets.h before compiling certain files in kernel/.
 # In order to do that, we should use the archprepare target, but we can't since

diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile
index 3f1490bfb938a0c064b72710c5e85db0084e7e19..88b3e2a214084522f079a7928f44abdac2c2ba40 100644 (file)
--- a/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@ -81,3 +81,6 @@ extra-y                                       += $(head-y) vmlinux.lds
 ifeq ($(CONFIG_DEBUG_EFI),y)
 AFLAGS_head.o += -DVMLINUX_PATH="\"$(realpath $(objtree)/vmlinux)\""
 endif
+
+# for cleaning
+subdir- += vdso vdso32

diff --git a/arch/csky/Kbuild b/arch/csky/Kbuild
index a4e40e534e6a84db241abfe5076962a90f8a71bd..4e39f7abdeb6dc90d4018a927f11f139515a4ce8 100644 (file)
--- a/arch/csky/Kbuild
+++ b/arch/csky/Kbuild
@@ -1 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-only
+
+# for cleaning
+subdir- += boot

diff --git a/arch/csky/Makefile b/arch/csky/Makefile
index 37f593a4bf53612dd8ff5492bde0e24bec13f574..86680507763647faafe6f436533f7c15ef90d0d9 100644 (file)
--- a/arch/csky/Makefile
+++ b/arch/csky/Makefile
@@ -76,9 +76,6 @@ all: zImage
 zImage Image uImage: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
-archclean:
-       $(Q)$(MAKE) $(clean)=$(boot)
-
 define archhelp
   echo  '* zImage       - Compressed kernel image (arch/$(ARCH)/boot/zImage)'
   echo  '  Image        - Uncompressed kernel image (arch/$(ARCH)/boot/Image)'

diff --git a/arch/h8300/Kbuild b/arch/h8300/Kbuild
index b2583e7efbd1d91bc58be2d0fbf0faac088367fc..e4703f3534ccafc6e3bd11d789d5d475a0b43398 100644 (file)
--- a/arch/h8300/Kbuild
+++ b/arch/h8300/Kbuild
@@ -1,2 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
 obj-y  += kernel/ mm/ boot/dts/
+
+# for cleaning
+subdir- += boot

diff --git a/arch/h8300/Makefile b/arch/h8300/Makefile
index eb4cb8f6830c572e3cf609f227f986a8e2ea23b2..807f41e60ee4a5b06f9494f3d4f11ae6aad22151 100644 (file)
--- a/arch/h8300/Makefile
+++ b/arch/h8300/Makefile
@@ -34,9 +34,6 @@ libs-y        += arch/$(ARCH)/lib/
 
 boot := arch/h8300/boot
 
-archclean:
-       $(Q)$(MAKE) $(clean)=$(boot)
-
 vmlinux.srec vmlinux.bin zImage uImage.bin: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 

diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
index 7e548c654a290f286cdce7740bbc4eef7d92f47d..3b3ac3e1f2728145746c436c0d8ed930aa09b18f 100644 (file)
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
@@ -67,8 +67,6 @@ vmlinux.bin: vmlinux FORCE
 unwcheck: vmlinux
        -$(Q)READELF=$(READELF) $(PYTHON3) $(srctree)/arch/ia64/scripts/unwcheck.py $<
 
-archclean:
-
 archheaders:
        $(Q)$(MAKE) $(build)=arch/ia64/kernel/syscalls all
 

diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index dd0c0ec67f67064d82b22e2636f4d3b1b7c41959..740fc97b9c0f00f0d9c9f56b1ed09c16fa855cf7 100644 (file)
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -2,9 +2,7 @@
 # m68k/Makefile
 #
 # This file is included by the global makefile so that you can add your own
-# architecture-specific flags and dependencies. Remember to do have actions
-# for "archclean" and "archdep" for cleaning up and making dependencies for
-# this architecture
+# architecture-specific flags and dependencies.
 #
 # This file is subject to the terms and conditions of the GNU General Public
 # License.  See the file "COPYING" in the main directory of this archive

diff --git a/arch/microblaze/Kbuild b/arch/microblaze/Kbuild
index a1c5978893198b2a2ef5ee83c1bd4d0a0d1d00fd..077a0b8e961571585988c30435d5ff2568674617 100644 (file)
--- a/arch/microblaze/Kbuild
+++ b/arch/microblaze/Kbuild
@@ -3,3 +3,6 @@ obj-y                   += kernel/
 obj-y                  += mm/
 obj-$(CONFIG_PCI)      += pci/
 obj-y                  += boot/dts/
+
+# for cleaning
+subdir- += boot

diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
index 9adc6b6434dfeba62346959413acf6f7c392573c..e775a696aa6fc37dfab79287920b9ca0cfa4697e 100644 (file)
--- a/arch/microblaze/Makefile
+++ b/arch/microblaze/Makefile
@@ -60,9 +60,6 @@ export DTB
 
 all: linux.bin
 
-archclean:
-       $(Q)$(MAKE) $(clean)=$(boot)
-
 archheaders:
        $(Q)$(MAKE) $(build)=arch/microblaze/kernel/syscalls all
 

diff --git a/arch/mips/Kbuild b/arch/mips/Kbuild
index d5d6ef9bb9867835fe221aa5501187212928918a..9e8071f0e58ff1271c0bb118e12704838082aaba 100644 (file)
--- a/arch/mips/Kbuild
+++ b/arch/mips/Kbuild
@@ -25,3 +25,6 @@ obj-y += vdso/
 ifdef CONFIG_KVM
 obj-y += kvm/
 endif
+
+# for cleaning
+subdir- += boot

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index ea3cd080a1c7dc328b49aa3aa06a84b6c0c19af4..e036fc025cccb28085c92fb26e260f100d758171 100644 (file)
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -8,8 +8,7 @@
 # Copyright (C) 2002, 2003, 2004  Maciej W. Rozycki
 #
 # This file is included by the global makefile so that you can add your own
-# architecture-specific flags and dependencies. Remember to do have actions
-# for "archclean" cleaning up for this architecture.
+# architecture-specific flags and dependencies.
 #
 
 archscripts: scripts_basic
@@ -426,11 +425,6 @@ endif
        $(Q)install -D -m 644 .config $(INSTALL_PATH)/config-$(KERNELRELEASE)
        $(Q)install -D -m 644 System.map $(INSTALL_PATH)/System.map-$(KERNELRELEASE)
 
-archclean:
-       $(Q)$(MAKE) $(clean)=arch/mips/boot
-       $(Q)$(MAKE) $(clean)=arch/mips/boot/compressed
-       $(Q)$(MAKE) $(clean)=arch/mips/boot/tools
-
 archheaders:
        $(Q)$(MAKE) $(build)=arch/mips/kernel/syscalls all
 

diff --git a/arch/mips/boot/Makefile b/arch/mips/boot/Makefile
index a3da2c5d63c2159a8d81d6e00fe7b50addbf6a58..196c44fa72d90c4fb1eac7f92e4bd7e8221c991f 100644 (file)
--- a/arch/mips/boot/Makefile
+++ b/arch/mips/boot/Makefile
@@ -171,3 +171,6 @@ $(obj)/vmlinux.itb: $(obj)/vmlinux.its $(obj)/vmlinux.bin FORCE
 
 $(obj)/vmlinux.%.itb: $(obj)/vmlinux.%.its $(obj)/vmlinux.bin.% FORCE
        $(call if_changed,itb-image,$<)
+
+# for cleaning
+subdir- += compressed tools

diff --git a/arch/nds32/Kbuild b/arch/nds32/Kbuild
index a4e40e534e6a84db241abfe5076962a90f8a71bd..4e39f7abdeb6dc90d4018a927f11f139515a4ce8 100644 (file)
--- a/arch/nds32/Kbuild
+++ b/arch/nds32/Kbuild
@@ -1 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-only
+
+# for cleaning
+subdir- += boot

diff --git a/arch/nds32/Makefile b/arch/nds32/Makefile
index c17fc3a755c38bc45e33293d6538287a07082a64..797ad9b450af210562d526fac5f1b5a6f4d4bba9 100644 (file)
--- a/arch/nds32/Makefile
+++ b/arch/nds32/Makefile
@@ -64,9 +64,6 @@ prepare: vdso_prepare
 vdso_prepare: prepare0
        $(Q)$(MAKE) $(build)=arch/nds32/kernel/vdso include/generated/vdso-offsets.h
 
-archclean:
-       $(Q)$(MAKE) $(clean)=$(boot)
-
 define archhelp
   echo  '  Image         - kernel image (arch/$(ARCH)/boot/Image)'
 endef

diff --git a/arch/nios2/Kbuild b/arch/nios2/Kbuild
index a4e40e534e6a84db241abfe5076962a90f8a71bd..4e39f7abdeb6dc90d4018a927f11f139515a4ce8 100644 (file)
--- a/arch/nios2/Kbuild
+++ b/arch/nios2/Kbuild
@@ -1 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-only
+
+# for cleaning
+subdir- += boot

diff --git a/arch/nios2/Makefile b/arch/nios2/Makefile
index 72e8ff065cf70e2553488a9e0b88ab6cde711f8e..02d678559066f18c8c6b2dfd672f88b71430063d 100644 (file)
--- a/arch/nios2/Makefile
+++ b/arch/nios2/Makefile
@@ -8,8 +8,7 @@
 # Written by Fredrik Markstrom
 #
 # This file is included by the global makefile so that you can add your own
-# architecture-specific flags and dependencies. Remember to do have actions
-# for "archclean" cleaning up for this architecture.
+# architecture-specific flags and dependencies.
 #
 # Nios2 port by Wind River Systems Inc trough:
 #   [email protected] and [email protected]
@@ -53,9 +52,6 @@ core-y        += $(nios2-boot)/dts/
 
 all: vmImage
 
-archclean:
-       $(Q)$(MAKE) $(clean)=$(nios2-boot)
-
 $(BOOT_TARGETS): vmlinux
        $(Q)$(MAKE) $(build)=$(nios2-boot) $(nios2-boot)/$@
 

diff --git a/arch/openrisc/Kbuild b/arch/openrisc/Kbuild
index 4234b4c03e725af424ddacdd3bf742ea584cd452..b0b0f2b03f872b83b2c5b2e4ce557f000ad5dcfa 100644 (file)
--- a/arch/openrisc/Kbuild
+++ b/arch/openrisc/Kbuild
@@ -1,3 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-y += lib/ kernel/ mm/
 obj-y += boot/dts/
+
+# for cleaning
+subdir- += boot

diff --git a/arch/openrisc/Makefile b/arch/openrisc/Makefile
index c52de526e51899b39ae9e67ba68794efa7e9a63c..760b734fb82277b2845dc8c121c6293e90df9377 100644 (file)
--- a/arch/openrisc/Makefile
+++ b/arch/openrisc/Makefile
@@ -1,9 +1,7 @@
 # BK Id: %F% %I% %G% %U% %#%
 #
 # This file is included by the global makefile so that you can add your own
-# architecture-specific flags and dependencies. Remember to do have actions
-# for "archclean" and "archdep" for cleaning up and making dependencies for
-# this architecture
+# architecture-specific flags and dependencies.
 #
 # This file is subject to the terms and conditions of the GNU General Public
 # License.  See the file "COPYING" in the main directory of this archive
@@ -48,6 +46,3 @@ PHONY += vmlinux.bin
 
 vmlinux.bin: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
-
-archclean:
-       $(Q)$(MAKE) $(clean)=$(boot)

diff --git a/arch/parisc/Kbuild b/arch/parisc/Kbuild
index 3c068b700a8103fe3d4d3fb8902b4db86612cc89..a6d3b280ba0c20466771ad697b5f480b3946e475 100644 (file)
--- a/arch/parisc/Kbuild
+++ b/arch/parisc/Kbuild
@@ -1,2 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
 obj-y  += mm/ kernel/ math-emu/
+
+# for cleaning
+subdir- += boot

diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile
index fcde3ffa02213f669dbd4549422d31d7d1f29863..8db4af4879d02f63c84a72e9304a71586bf70f7c 100644 (file)
--- a/arch/parisc/Makefile
+++ b/arch/parisc/Makefile
@@ -2,9 +2,7 @@
 # parisc/Makefile
 #
 # This file is included by the global makefile so that you can add your own
-# architecture-specific flags and dependencies. Remember to do have actions
-# for "archclean" and "archdep" for cleaning up and making dependencies for
-# this architecture
+# architecture-specific flags and dependencies.
 #
 # This file is subject to the terms and conditions of the GNU General Public
 # License.  See the file "COPYING" in the main directory of this archive
@@ -181,8 +179,5 @@ define archhelp
        @echo  '  zinstall      - Install compressed vmlinuz kernel'
 endef
 
-archclean:
-       $(Q)$(MAKE) $(clean)=$(boot)
-
 archheaders:
        $(Q)$(MAKE) $(build)=arch/parisc/kernel/syscalls all

diff --git a/arch/powerpc/Kbuild b/arch/powerpc/Kbuild
index 5e2f9eaa3ee7d573c1371985efc20c2a1cbb3194..22cd0d55a8924abd9d5863d8b8c2487bc257ec19 100644 (file)
--- a/arch/powerpc/Kbuild
+++ b/arch/powerpc/Kbuild
@@ -16,3 +16,6 @@ obj-$(CONFIG_KVM)  += kvm/
 obj-$(CONFIG_PERF_EVENTS) += perf/
 obj-$(CONFIG_KEXEC_CORE)  += kexec/
 obj-$(CONFIG_KEXEC_FILE)  += purgatory/
+
+# for cleaning
+subdir- += boot

diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index aa6808e706470d9c109c28647ac3da7c0451623f..b61d8be3c2264c0ef84f466c841d28ebc9b8dcfe 100644 (file)
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -1,7 +1,5 @@
 # This file is included by the global makefile so that you can add your own
-# architecture-specific flags and dependencies. Remember to do have actions
-# for "archclean" and "archdep" for cleaning up and making dependencies for
-# this architecture.
+# architecture-specific flags and dependencies.
 #
 # This file is subject to the terms and conditions of the GNU General Public
 # License.  See the file "COPYING" in the main directory of this archive
@@ -411,9 +409,6 @@ install:
        sh -x $(srctree)/$(boot)/install.sh "$(KERNELRELEASE)" vmlinux \
        System.map "$(INSTALL_PATH)"
 
-archclean:
-       $(Q)$(MAKE) $(clean)=$(boot)
-
 ifeq ($(KBUILD_EXTMOD),)
 # We need to generate vdso-offsets.h before compiling certain files in kernel/.
 # In order to do that, we should use the archprepare target, but we can't since

diff --git a/arch/riscv/Kbuild b/arch/riscv/Kbuild
index 4614c01ba5b32e9a149e752ec4f281b2db4123f1..fb3397223d5204d11a909ee11f88dfee0f967c84 100644 (file)
--- a/arch/riscv/Kbuild
+++ b/arch/riscv/Kbuild
@@ -2,3 +2,6 @@
 
 obj-y += kernel/ mm/ net/
 obj-$(CONFIG_BUILTIN_DTB) += boot/dts/
+
+# for cleaning
+subdir- += boot

diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
index 0eb4568fbd290c79e121a5c6f0f803c9fc8597df..753e13f3a9d24bafaa21c61a70bce6e03308a80c 100644 (file)
--- a/arch/riscv/Makefile
+++ b/arch/riscv/Makefile
@@ -1,7 +1,5 @@
 # This file is included by the global makefile so that you can add your own
-# architecture-specific flags and dependencies. Remember to do have actions
-# for "archclean" and "archdep" for cleaning up and making dependencies for
-# this architecture
+# architecture-specific flags and dependencies.
 #
 # This file is subject to the terms and conditions of the GNU General Public
 # License.  See the file "COPYING" in the main directory of this archive
@@ -137,6 +135,3 @@ zinstall: install-image = Image.gz
 install zinstall:
        $(CONFIG_SHELL) $(srctree)/$(boot)/install.sh $(KERNELRELEASE) \
        $(boot)/$(install-image) System.map "$(INSTALL_PATH)"
-
-archclean:
-       $(Q)$(MAKE) $(clean)=$(boot)

diff --git a/arch/s390/Kbuild b/arch/s390/Kbuild
index 8b98c501142df15026187aef1e1163f60bd9cbf7..76e36227717916d15873b41e4df1bd8fad244e3d 100644 (file)
--- a/arch/s390/Kbuild
+++ b/arch/s390/Kbuild
@@ -8,3 +8,6 @@ obj-$(CONFIG_APPLDATA_BASE)     += appldata/
 obj-y                          += net/
 obj-$(CONFIG_PCI)              += pci/
 obj-$(CONFIG_ARCH_HAS_KEXEC_PURGATORY) += purgatory/
+
+# for cleaning
+subdir- += boot tools

diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 450b351dfa8ef37c238443cbf5c4b84876aaeaba..69c45f600273bea6132060f84ffca10587a37889 100644 (file)
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -3,9 +3,7 @@
 # s390/Makefile
 #
 # This file is included by the global makefile so that you can add your own
-# architecture-specific flags and dependencies. Remember to do have actions
-# for "archclean" and "archdep" for cleaning up and making dependencies for
-# this architecture
+# architecture-specific flags and dependencies.
 #
 # Copyright (C) 1994 by Linus Torvalds
 #
@@ -147,10 +145,6 @@ zfcpdump:
 vdso_install:
        $(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso64 $@
 
-archclean:
-       $(Q)$(MAKE) $(clean)=$(boot)
-       $(Q)$(MAKE) $(clean)=$(tools)
-
 archheaders:
        $(Q)$(MAKE) $(build)=$(syscalls) uapi
 

diff --git a/arch/sh/Kbuild b/arch/sh/Kbuild
index 48c2a091a0720754f2f4c7ce2ad06516f24a0fc9..be171880977e5d250117b4c9810de7aa0ca7fbf6 100644 (file)
--- a/arch/sh/Kbuild
+++ b/arch/sh/Kbuild
@@ -2,3 +2,6 @@
 obj-y                          += kernel/ mm/ boards/
 obj-$(CONFIG_SH_FPU_EMU)       += math-emu/
 obj-$(CONFIG_USE_BUILTIN_DTB)  += boot/dts/
+
+# for cleaning
+subdir- += boot

diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 7814639006213d5cc1331e1286a9580e412cc1f9..b39412bf91fb0afafee74140321d5d328be74290 100644 (file)
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -198,9 +198,6 @@ compressed: zImage
 archprepare:
        $(Q)$(MAKE) $(build)=arch/sh/tools include/generated/machtypes.h
 
-archclean:
-       $(Q)$(MAKE) $(clean)=$(boot)
-
 archheaders:
        $(Q)$(MAKE) $(build)=arch/sh/kernel/syscalls all
 

diff --git a/arch/sparc/Kbuild b/arch/sparc/Kbuild
index c9e574906a9b9174c0de4bb8b189646f6347d1e0..71cb3d934bf6c36fdf8a5526cf5da969a7366ee1 100644 (file)
--- a/arch/sparc/Kbuild
+++ b/arch/sparc/Kbuild
@@ -9,3 +9,6 @@ obj-y += math-emu/
 obj-y += net/
 obj-y += crypto/
 obj-$(CONFIG_SPARC64) += vdso/
+
+# for cleaning
+subdir- += boot

diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
index 24fb5a99f43941b0d09b3e41405b14e11799c253..c7008bbebc4cd17b38772ae77a722baccfd405e5 100644 (file)
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@ -75,9 +75,6 @@ install:
        sh $(srctree)/$(boot)/install.sh $(KERNELRELEASE) $(KBUILD_IMAGE) \
                System.map "$(INSTALL_PATH)"
 
-archclean:
-       $(Q)$(MAKE) $(clean)=$(boot)
-
 archheaders:
        $(Q)$(MAKE) $(build)=arch/sparc/kernel/syscalls all
 

diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild
index 30dec019756b9bac2cf8aacb0ad787659d6a8d99..f384cb1a4f7a8ddca2f73e2cdf4b80bdb3445464 100644 (file)
--- a/arch/x86/Kbuild
+++ b/arch/x86/Kbuild
@@ -25,3 +25,6 @@ obj-y += platform/
 obj-y += net/
 
 obj-$(CONFIG_KEXEC_FILE) += purgatory/
+
+# for cleaning
+subdir- += boot tools

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 7488cfbbd2f606b4a25664dd7153babd5d301800..67d7c265e0ced98f7d27eb46d01669bada75f2d0 100644 (file)
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -283,8 +283,6 @@ endif
 archclean:
        $(Q)rm -rf $(objtree)/arch/i386
        $(Q)rm -rf $(objtree)/arch/x86_64
-       $(Q)$(MAKE) $(clean)=$(boot)
-       $(Q)$(MAKE) $(clean)=arch/x86/tools
 
 define archhelp
   echo  '* bzImage             - Compressed kernel image (arch/x86/boot/bzImage)'

diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile
index 96714ef7c89e34581c1d53fe08a82ca1fbaf2493..9778216d6e09dbfa610e969e12ac95bb52d7803d 100644 (file)
--- a/arch/xtensa/Makefile
+++ b/arch/xtensa/Makefile
@@ -7,9 +7,7 @@
 # Copyright (C) 2014 Cadence Design Systems Inc.
 #
 # This file is included by the global makefile so that you can add your own
-# architecture-specific flags and dependencies. Remember to do have actions
-# for "archclean" and "archdep" for cleaning up and making dependencies for
-# this architecture
+# architecture-specific flags and dependencies.
 
 # Core configuration.
 # (Use VAR=<xtensa_config> to use another default compiler.)