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/linux.mk | |
| parent | 3f1d79d379aaf1a0d1e6431575539043a777d160 (diff) | |
| parent | 96652637ccfd94442224019c54341bf86094366a (diff) | |
| download | buildroot-novena-0a7f1bf51a32f4d9c6d6b49d2d4f6d6bf6dfcb08.tar.gz buildroot-novena-0a7f1bf51a32f4d9c6d6b49d2d4f6d6bf6dfcb08.zip | |
Merge branch 'for-2010.11/kernel-image-formats' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'linux/linux.mk')
| -rw-r--r-- | linux/linux.mk | 6 |
1 files changed, 5 insertions, 1 deletions
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: |