[SPARC]: Handle make w/o arg sanely, by Sam Ravnborg.

diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
index e74042a1d0eba96d1108397fd2fe311944bc72c8..9848f830e92c5cd3e93c8863dbe684f8470ebf8e 100644 (file)
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@ -54,13 +54,16 @@ NET_Y               := $(patsubst %/, %/built-in.o, $(net-y))
 LIBS_Y         := $(patsubst %/, %/lib.a, $(libs-y))
 export INIT_Y CORE_Y DRIVERS_Y NET_Y LIBS_Y HEAD_Y
 
-makeboot =$(Q)$(MAKE) -f scripts/Makefile.build obj=arch/$(ARCH)/boot $(1)
+# Default target
+all: image
+
+boot := arch/sparc/boot
 
 image tftpboot.img: vmlinux
-       $(call makeboot,arch/sparc/boot/$@)
+       $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
 archclean:
-       $(Q)$(MAKE) -f scripts/Makefile.clean obj=arch/$(ARCH)/boot
+       $(Q)$(MAKE) $(clean)=$(boot)
 
 prepare: include/asm-$(ARCH)/asm_offsets.h
 
@@ -72,3 +75,9 @@ include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
 
 CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h       \
                arch/$(ARCH)/kernel/asm-offsets.s
+
+# Don't use tabs in echo arguments.
+define archhelp
+  echo  '* image        - kernel image ($(boot)/image)'
+  echo  '  tftpboot.img - image prepared for tftp'
+endef

diff --git a/arch/sparc/boot/Makefile b/arch/sparc/boot/Makefile
index 50a46705e08d97d29da730bb857ba2a2b34b90d1..119cb66107a4fb8d5d50433a47314d9156ead23e 100644 (file)
--- a/arch/sparc/boot/Makefile
+++ b/arch/sparc/boot/Makefile
@@ -32,7 +32,3 @@ $(obj)/tftpboot.img: $(obj)/piggyback $(obj)/System.map $(obj)/image FORCE
 
 $(obj)/btfix.s: $(obj)/btfixupprep vmlinux FORCE
        $(call if_changed,btfix)
-
-archhelp:
-       @echo '* image          - kernel image ($(obj)/image)'
-       @echo '  tftpboot.img   - image prepared for tftp'