[Buildroot] [pull request] Pull request for branch for-2010.11/kernel-image-formats

[Buildroot] [pull request] Pull request for branch for-2010.11/kernel-image-formats

[Thomas Petazzoni]

Hello,

Two relatively minor improvements to the kernel build infrastructure.

Thomas

The following changes since commit 3e5e39a8a25a4a085afe08bdcf46933c8d569ed7:
  Peter Korsgaard (1):
        barebox/u-boot/linux: don't error out on missing config when make source

are available in the git repository at:

  git://git.busybox.net/~tpetazzoni/git/buildroot for-2010.11/kernel-image-formats

Thomas Petazzoni (2):
      linux: restrict output image formats to the appropriate arches
      linux: fix uImage location on AVR32

 linux/Config.in |   10 ++++++----
 linux/linux.mk  |    6 +++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

Thanks,
-- 
Thomas Petazzoni

[Buildroot] [PATCH 1/2] linux: restrict output image formats to the appropriate arches

[Thomas Petazzoni]

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>
---
 linux/Config.in |   10 ++++++----
 linux/linux.mk  |    2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index a7109a5..1e015b7 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 aabecc1..4490023 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
 
-- 
1.7.0.4

[Buildroot] [PATCH 2/2] linux: fix uImage location on AVR32

[Thomas Petazzoni]

On most architectures, the kernel image can be found in
arch/<ARCH>/boot, but on AVR32, it's in arch/<ARCH>/boot/images.

Issue initially reported by Joachim Pihl
<joachim.pihl@sensordevelopments.com>.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 linux/linux.mk |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index 4490023..55dc2bf 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:
-- 
1.7.0.4

[Buildroot] [pull request] Pull request for branch for-2010.11/kernel-image-formats

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> Hello,
 Thomas> Two relatively minor improvements to the kernel build infrastructure.

 Thomas> Thomas

 Thomas> The following changes since commit 3e5e39a8a25a4a085afe08bdcf46933c8d569ed7:
 Thomas>   Peter Korsgaard (1):
 Thomas>         barebox/u-boot/linux: don't error out on missing config when make source

 Thomas> are available in the git repository at:

 Thomas>   git://git.busybox.net/~tpetazzoni/git/buildroot for-2010.11/kernel-image-formats

Pulled, thanks!

-- 
Bye, Peter Korsgaard