From 71c05023d7439658e5ba919025ab1c9ca4321d14 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 5 Dec 2010 21:53:23 +0100 Subject: [PATCH] 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 Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++++ linux/linux.mk | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/linux/Config.in b/linux/Config.in index 4ded38bb75..5e28b449e2 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 40109acb9b..86d7e260fc 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: -- 2.30.2