kbuild: Move archhelp to arch/$(ARCH)/Makefile

arch/$(ARCH)/Makefile already contains the kbuild required additions
to allow the kernel to be built for the architecture in question.
Moving archhelp centralise this information, and no longer require a
boot directory to exist to utilise this feature.

Update i386 to define archhelp in arch/$(ARCH)/Makefile
Other architectures will be updated in next cset.

diff --git a/Makefile b/Makefile
index 3f39c51862a2c71b5c6fd7043c464b7f5d38fe78..5f6cd42ec359bc64aa7298fb793d78f195b1f831 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -810,7 +810,8 @@ help:
        @$(MAKE) --no-print-directory -f Documentation/DocBook/Makefile dochelp
        @echo  ''
        @echo  'Architecture specific targets ($(ARCH)):'
-       @$(MAKE) --no-print-directory -f arch/$(ARCH)/boot/Makefile archhelp
+       @$(if $(archhelp),$(archhelp),\
+               echo '  No architecture specific help defined for $(ARCH)')
        @echo  ''
        @echo  'Execute "make" or "make all" to build all targets marked with [*] '
        @echo  'For further info browse Documentation/kbuild/*'

diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 706e02cd4b9eef52c7856ab70997946f97182534..7069983f76a6c6e2b144c3e4960d96f4d137d662 100644 (file)
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -109,3 +109,12 @@ install: vmlinux
 
 archclean:
        $(Q)$(MAKE) $(clean)=arch/i386/boot
+
+define archhelp
+  echo  '* bzImage     - Compressed kernel image (arch/$(ARCH)/boot/bzImage)'
+  echo  '  install     - Install kernel using'
+  echo  '                 (your) ~/bin/installkernel or'
+  echo  '                 (distribution) /sbin/installkernel or'
+  echo  '                 install to $$(INSTALL_PATH) and run lilo'
+endef
+

diff --git a/arch/i386/boot/Makefile b/arch/i386/boot/Makefile
index bcb97140c50f17758112a5ffcb9c5dd0bb15c48a..701136c7581cf22a0f11370d6749c4b24bbe38d8 100644 (file)
--- a/arch/i386/boot/Makefile
+++ b/arch/i386/boot/Makefile
@@ -74,11 +74,3 @@ zlilo: $(BOOTIMAGE)
 
 install: $(BOOTIMAGE)
        sh $(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)"
-
-archhelp:
-       @echo  '* bzImage       - Compressed kernel image (arch/$(ARCH)/boot/bzImage)'
-       @echo  '  install       - Install kernel using'
-       @echo  '                  (your) ~/bin/installkernel or'
-       @echo  '                  (distribution) /sbin/installkernel or'
-       @echo  '                  install to $$(INSTALL_PATH) and run lilo'
-