diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-09-29 12:36:07 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-09-29 12:36:07 +0200 |
| commit | 0a7f1bf51a32f4d9c6d6b49d2d4f6d6bf6dfcb08 (patch) | |
| tree | c56b3a03d69d89d61fed2123efd2707215d698ce /linux | |
| parent | 3f1d79d379aaf1a0d1e6431575539043a777d160 (diff) | |
| parent | 96652637ccfd94442224019c54341bf86094366a (diff) | |
Merge branch 'for-2010.11/kernel-image-formats' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Config.in | 10 | ||||
| -rw-r--r-- | linux/linux.mk | 6 |
2 files changed, 11 insertions, 5 deletions
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..55dc2bfe8 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -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: |