Add vmlinuz support in Kernel binary format for MIPS.

Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/linux/Config.in b/linux/Config.in
index 469fd7ca9a68065edd8dfede77e5f3f38e049882..0082ca88de21035b1d7a0ecee289e36b008d3d5b 100644 (file)
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -148,6 +148,10 @@ config BR2_LINUX_KERNEL_VMLINUX
        bool "vmlinux"
        depends on BR2_mips || BR2_mipsel || BR2_powerpc
 
+config BR2_LINUX_KERNEL_VMLINUZ
+       bool "vmlinuz"
+       depends on BR2_mips || BR2_mipsel
+
 config BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM
        bool "custom target"
        help

diff --git a/linux/linux.mk b/linux/linux.mk
index 6b6fd5c4ae4e6705e05505ac385f066d5011f40f..9beb706453323b6261e21f9276e5924f939006ca 100644 (file)
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -65,6 +65,8 @@ else ifeq ($(BR2_LINUX_KERNEL_VMLINUX_BIN),y)
 LINUX_IMAGE_NAME=vmlinux.bin
 else ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)
 LINUX_IMAGE_NAME=vmlinux
+else ifeq ($(BR2_LINUX_KERNEL_VMLINUZ),y)
+LINUX_IMAGE_NAME=vmlinuz
 endif
 endif
 
@@ -82,6 +84,8 @@ endif
 
 ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)
 LINUX_IMAGE_PATH=$(LINUX_DIR)/$(LINUX_IMAGE_NAME)
+else ifeq ($(BR2_LINUX_KERNEL_VMLINUZ),y)
+LINUX_IMAGE_PATH=$(LINUX_DIR)/$(LINUX_IMAGE_NAME)
 else
 ifeq ($(KERNEL_ARCH),avr32)
 LINUX_IMAGE_PATH=$(KERNEL_ARCH_PATH)/boot/images/$(LINUX_IMAGE_NAME)