1 files changed, 28 insertions, 3 deletions

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 77f5021218d3..ba04782c4b91 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -69,6 +69,7 @@ endif
 
 all-$(CONFIG_BOOT_ELF32)        := $(vmlinux-32)
 all-$(CONFIG_BOOT_ELF64)        := $(vmlinux-64)
+all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlinuz
 
 #
 # GCC uses -G 0 -mabicalls -fpic as default.  We don't want PIC in the kernel
@@ -331,7 +332,7 @@ load-$(CONFIG_LEMOTE_FULOONG2E) +=0xffffffff80100000
 core-$(CONFIG_MIPS_MALTA)       += arch/mips/mti-malta/
 cflags-$(CONFIG_MIPS_MALTA)     += -I$(srctree)/arch/mips/include/asm/mach-malta
 load-$(CONFIG_MIPS_MALTA)       += 0xffffffff80100000
-all-$(CONFIG_MIPS_MALTA)        := vmlinux.bin
+all-$(CONFIG_MIPS_MALTA)        := vmlinuz.bin
 
 #
 # MIPS SIM
@@ -581,7 +582,7 @@ load-$(CONFIG_SNI_RM)		+= 0xffffffff80600000
 else
 load-$(CONFIG_SNI_RM)           += 0xffffffff80030000
 endif
-all-$(CONFIG_SNI_RM)            := vmlinux.ecoff
+all-$(CONFIG_SNI_RM)            := vmlinuz.ecoff
 
 #
 # Common TXx9
@@ -699,9 +700,23 @@ vmlinux.64: vmlinux
         $(OBJCOPY) -O $(64bit-bfd) $(OBJCOPYFLAGS) $< $@
 
 makeboot =$(Q)$(MAKE) $(build)=arch/mips/boot VMLINUX=$(vmlinux-32) $(1)
+makezboot =$(Q)$(MAKE) $(build)=arch/mips/boot/compressed \
+           VMLINUX_LOAD_ADDRESS=$(load-y) 32bit-bfd=$(32bit-bfd) $(1)
 
 all:    $(all-y)
 
+vmlinuz: vmlinux FORCE
+        +@$(call makezboot,$@)
+
+vmlinuz.bin: vmlinux
+        +@$(call makezboot,$@)
+
+vmlinuz.ecoff: vmlinux
+        +@$(call makezboot,$@)
+
+vmlinuz.srec: vmlinux
+        +@$(call makezboot,$@)
+
 vmlinux.bin: $(vmlinux-32)
         +@$(call makeboot,$@)
 
@@ -726,11 +741,13 @@ endif
 
 install:
         $(Q)install -D -m 755 vmlinux $(INSTALL_PATH)/vmlinux-$(KERNELRELEASE)
+        $(Q)install -D -m 755 vmlinuz $(INSTALL_PATH)/vmlinuz-$(KERNELRELEASE)
         $(Q)install -D -m 644 .config $(INSTALL_PATH)/config-$(KERNELRELEASE)
         $(Q)install -D -m 644 System.map $(INSTALL_PATH)/System.map-$(KERNELRELEASE)
 
 archclean:
         @$(MAKE) $(clean)=arch/mips/boot
+        @$(MAKE) $(clean)=arch/mips/boot/compressed
         @$(MAKE) $(clean)=arch/mips/lasat
 
 define archhelp
@@ -738,10 +755,18 @@ define archhelp
         echo '  vmlinux.ecoff        - ECOFF boot image'
         echo '  vmlinux.bin          - Raw binary boot image'
         echo '  vmlinux.srec         - SREC boot image'
+        echo '  vmlinuz              - Compressed boot(zboot) image'
+        echo '  vmlinuz.ecoff        - ECOFF zboot image'
+        echo '  vmlinuz.bin          - Raw binary zboot image'
+        echo '  vmlinuz.srec         - SREC zboot image'
         echo
         echo '  These will be default as apropriate for a configured platform.'
 endef
 
 CLEAN_FILES += vmlinux.32 \
                vmlinux.64 \
-               vmlinux.ecoff
+               vmlinux.ecoff \
+               vmlinuz \
+               vmlinuz.ecoff \
+               vmlinuz.bin \
+               vmlinuz.srec