浏览代码

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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas Petazzoni 15 年之前
父节点
当前提交
b626dc0791
共有 2 个文件被更改,包括 7 次插入5 次删除
  1. 6 4
      linux/Config.in
  2. 1 1
      linux/linux.mk

+ 6 - 4
linux/Config.in

@@ -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
 

+ 1 - 1
linux/linux.mk

@@ -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