summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-12-05 21:53:23 +0100
committerPeter Korsgaard <jacmet@sunsite.dk>2010-12-17 16:53:18 +0100
commit71c05023d7439658e5ba919025ab1c9ca4321d14 (patch)
treebaec3f3ca2c7e45b1ece30a2cff7e1c05150b444
parentf66d4b05e1dc9f835b2ca9fcd012e1a8d2aeed3f (diff)
linux: add support for ELF vmlinux image
The ELF vmlinux image found at the root of the kernel source tree is the format that Qemu needs when emulating mips(el) or ppc targets, so add support for it. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--linux/Config.in4
-rw-r--r--linux/linux.mk6
2 files changed, 10 insertions, 0 deletions
diff --git a/linux/Config.in b/linux/Config.in
index 4ded38bb7..5e28b449e 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -129,6 +129,10 @@ config BR2_LINUX_KERNEL_VMLINUX_BIN
bool "vmlinux.bin"
depends on BR2_mips || BR2_mipsel || BR2_sh || BR2_sh64
+config BR2_LINUX_KERNEL_VMLINUX
+ bool "vmlinux"
+ depends on BR2_mips || BR2_mipsel
+
endchoice
endif # BR2_LINUX_KERNEL
diff --git a/linux/linux.mk b/linux/linux.mk
index 40109acb9..86d7e260f 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -39,13 +39,19 @@ else ifeq ($(BR2_LINUX_KERNEL_ZIMAGE),y)
LINUX26_IMAGE_NAME=zImage
else ifeq ($(BR2_LINUX_KERNEL_VMLINUX_BIN),y)
LINUX26_IMAGE_NAME=vmlinux.bin
+else ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)
+LINUX26_IMAGE_NAME=vmlinux
endif
+ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)
+LINUX26_IMAGE_PATH=$(LINUX26_DIR)/$(LINUX26_IMAGE_NAME)
+else
ifeq ($(KERNEL_ARCH),avr32)
LINUX26_IMAGE_PATH=$(LINUX26_DIR)/arch/$(KERNEL_ARCH)/boot/images/$(LINUX26_IMAGE_NAME)
else
LINUX26_IMAGE_PATH=$(LINUX26_DIR)/arch/$(KERNEL_ARCH)/boot/$(LINUX26_IMAGE_NAME)
endif
+endif # BR2_LINUX_KERNEL_VMLINUX
# Download
$(LINUX26_DIR)/.stamp_downloaded: