From b626dc0791002d61f47c53b619fcba048c40171d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 1 Sep 2010 15:26:24 +0200 Subject: 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 . Signed-off-by: Thomas Petazzoni --- linux/Config.in | 10 ++++++---- linux/linux.mk | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'linux') diff --git a/linux/Config.in b/linux/Config.in index a7109a507..1e015b7fc 100644 --- a/linux/Config.in +++ b/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 diff --git a/linux/linux.mk b/linux/linux.mk index aabecc1f6..4490023a4 100644 --- a/linux/linux.mk +++ b/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 -- cgit v1.2.3 From 96652637ccfd94442224019c54341bf86094366a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 7 Sep 2010 15:08:07 +0200 Subject: linux: fix uImage location on AVR32 On most architectures, the kernel image can be found in arch//boot, but on AVR32, it's in arch//boot/images. Issue initially reported by Joachim Pihl . Signed-off-by: Thomas Petazzoni --- linux/linux.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'linux') diff --git a/linux/linux.mk b/linux/linux.mk index 4490023a4..55dc2bfe8 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -42,7 +42,11 @@ 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: -- cgit v1.2.3