Commit b626dc07 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

linux: restrict output image formats to the appropriate arches 



Some Linux kernel output image formats are available on some archs,
some not. For example 'uImage' is not supported on MIPS, so let's
prevent the user from making this selection.

Issue initially reported by Choi, David <David.Choi@Micrel.Com>.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 3e5e39a8

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

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 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