diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-08 15:39:30 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-08 15:39:30 -0700 |
| commit | 98d86c091534f35c4bab294451ae6bccab8e9075 (patch) | |
| tree | 98c9f0b80bb078405cf173f1d5cc91c72e77082d /arch/sparc/Makefile | |
| parent | d875a4b0ffad754e6d89fa561ea7dcdd79c9508b (diff) | |
| parent | 4d084617fb0d025c42c242362d1f27d337e2d407 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Conflicts:
arch/sparc/kernel/of_device.c
Diffstat (limited to 'arch/sparc/Makefile')
| -rw-r--r-- | arch/sparc/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile index 6668e6037af..9592889a6fd 100644 --- a/arch/sparc/Makefile +++ b/arch/sparc/Makefile @@ -52,20 +52,24 @@ endif export INIT_Y CORE_Y DRIVERS_Y NET_Y LIBS_Y HEAD_Y kallsyms.o # Default target -all: image +all: zImage boot := arch/sparc/boot -image tftpboot.img: vmlinux +image zImage tftpboot.img: vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ archclean: $(Q)$(MAKE) $(clean)=$(boot) +# This is the image used for packaging +KBUILD_IMAGE := $(boot)/zImage + CLEAN_FILES += arch/$(ARCH)/boot/System.map # Don't use tabs in echo arguments. define archhelp echo '* image - kernel image ($(boot)/image)' + echo '* zImage - stripped kernel image ($(boot)/zImage)' echo ' tftpboot.img - image prepared for tftp' endef |