diff options
author | Jurij Smakov <jurij@wooyd.org> | 2009-08-16 21:21:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-08-16 21:21:47 -0400 |
commit | 48e46b7b311c54525712c28004f0a59f2c931d30 (patch) | |
tree | 139aa35cb6554f425461a941610d0d8a189a0dc5 /arch | |
parent | b2add73dbf93fd50f00564d7abc3e2b9aa9dd20c (diff) |
sparc64: build compressed image (zImage) by default
Besides creating the uncompressed vmlinux image for sparc64, also
create a compressed zImage. This is more consistent with other
architectures and required to make the 'deb-pkg' target work.
Signed-off-by: Jurij Smakov <jurij@wooyd.org>
Signed-off-by: Frans Pop <elendil@planet.nl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sparc/Makefile | 12 | ||||
-rw-r--r-- | arch/sparc/boot/Makefile | 3 |
2 files changed, 9 insertions, 6 deletions
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile index 2003ded054c2..467221dd5702 100644 --- a/arch/sparc/Makefile +++ b/arch/sparc/Makefile | |||
@@ -38,10 +38,6 @@ CPPFLAGS_vmlinux.lds += -m32 | |||
38 | # Actual linking is done with "make image". | 38 | # Actual linking is done with "make image". |
39 | LDFLAGS_vmlinux = -r | 39 | LDFLAGS_vmlinux = -r |
40 | 40 | ||
41 | # Default target | ||
42 | all: zImage | ||
43 | |||
44 | |||
45 | else | 41 | else |
46 | ##### | 42 | ##### |
47 | # sparc64 | 43 | # sparc64 |
@@ -91,6 +87,9 @@ endif | |||
91 | 87 | ||
92 | boot := arch/sparc/boot | 88 | boot := arch/sparc/boot |
93 | 89 | ||
90 | # Default target | ||
91 | all: zImage | ||
92 | |||
94 | image zImage tftpboot.img vmlinux.aout: vmlinux | 93 | image zImage tftpboot.img vmlinux.aout: vmlinux |
95 | $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ | 94 | $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ |
96 | 95 | ||
@@ -109,8 +108,9 @@ define archhelp | |||
109 | endef | 108 | endef |
110 | else | 109 | else |
111 | define archhelp | 110 | define archhelp |
112 | echo '* vmlinux - Standard sparc64 kernel' | 111 | echo '* vmlinux - standard sparc64 kernel' |
113 | echo ' vmlinux.aout - a.out kernel for sparc64' | 112 | echo '* zImage - stripped and compressed sparc64 kernel ($(boot)/zImage)' |
113 | echo ' vmlinux.aout - a.out kernel for sparc64' | ||
114 | echo ' tftpboot.img - image prepared for tftp' | 114 | echo ' tftpboot.img - image prepared for tftp' |
115 | endef | 115 | endef |
116 | endif | 116 | endif |
diff --git a/arch/sparc/boot/Makefile b/arch/sparc/boot/Makefile index 1ff0fd924756..97e3feb9ff1b 100644 --- a/arch/sparc/boot/Makefile +++ b/arch/sparc/boot/Makefile | |||
@@ -79,6 +79,9 @@ $(obj)/image: vmlinux FORCE | |||
79 | $(call if_changed,strip) | 79 | $(call if_changed,strip) |
80 | @echo ' kernel: $@ is ready' | 80 | @echo ' kernel: $@ is ready' |
81 | 81 | ||
82 | $(obj)/zImage: $(obj)/image | ||
83 | $(call if_changed,gzip) | ||
84 | |||
82 | $(obj)/tftpboot.img: $(obj)/image $(obj)/piggyback_64 System.map $(ROOT_IMG) FORCE | 85 | $(obj)/tftpboot.img: $(obj)/image $(obj)/piggyback_64 System.map $(ROOT_IMG) FORCE |
83 | $(call if_changed,elftoaout) | 86 | $(call if_changed,elftoaout) |
84 | $(call if_changed,piggy) | 87 | $(call if_changed,piggy) |