summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKelvin Cheung <keguang.zhang@gmail.com>2011-09-20 09:01:26 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2011-10-28 08:52:31 (GMT)
commitc1485d51e8d66c0608935135ef41f5c5deabc587 (patch)
tree374382121a1ec51eb0992cf57ea8c60ccca86296
parentccd96a3559324b742f357ce6bd8969c6318fe94b (diff)
downloadbuildroot-c1485d51e8d66c0608935135ef41f5c5deabc587.tar.gz
buildroot-c1485d51e8d66c0608935135ef41f5c5deabc587.tar.bz2
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>
-rw-r--r--linux/Config.in4
-rw-r--r--linux/linux.mk4
2 files changed, 8 insertions, 0 deletions
diff --git a/linux/Config.in b/linux/Config.in
index 469fd7c..0082ca8 100644
--- 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 6b6fd5c..9beb706 100644
--- 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)