Commit 0a7f1bf5 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'for-2010.11/kernel-image-formats' of git://git.busybox.net/~tpetazzoni/git/buildroot

parents 3f1d79d3 96652637

linux/Config.in

+6 −4
Original line number Diff line number Diff line
@@ -111,20 +111,22 @@ config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE 


choice

	prompt "Kernel binary format"

	default BR2_LINUX_KERNEL_UIMAGE if !BR2_i386 && !BR2_x86_64

	default BR2_LINUX_KERNEL_BZIMAGE if BR2_i386 || BR2_x86_64



config BR2_LINUX_KERNEL_UIMAGE

	bool "uImage"

	depends on BR2_arm || BR2_armeb || BR2_powerpc || BR2_avr32 || BR2_sh || BR2_sh64



config BR2_LINUX_KERNEL_BZIMAGE

	bool "bzImage"

	depends on BR2_i386 || BR2_x86_64



config BR2_LINUX_KERNEL_ZIMAGE

	bool "zImage"

	depends on BR2_arm || BR2_armeb || BR2_powerpc || BR2_sparc || BR2_sh || BR2_sh64 || BR2_xtensa



config BR2_LINUX_KERNEL_VMLINUX

	bool "vmlinux"

config BR2_LINUX_KERNEL_VMLINUX_BIN

	bool "vmlinux.bin"

	depends on BR2_mips || BR2_mipsel || BR2_sh || BR2_sh64



endchoice

linux/linux.mk

+5 −1
Original line number Diff line number Diff line
@@ -38,11 +38,15 @@ else ifeq ($(BR2_LINUX_KERNEL_BZIMAGE),y) 
LINUX26_IMAGE_NAME=bzImage

else ifeq ($(BR2_LINUX_KERNEL_ZIMAGE),y)

LINUX26_IMAGE_NAME=zImage

else ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)

else ifeq ($(BR2_LINUX_KERNEL_VMLINUX_BIN),y)

LINUX26_IMAGE_NAME=vmlinux.bin

endif



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



# Download

$(LINUX26_DIR)/.stamp_downloaded: