diff options
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Config.in | 2 | ||||
| -rw-r--r-- | linux/linux.mk | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/linux/Config.in b/linux/Config.in index 17aa29aa7..bdb1abe94 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -115,7 +115,7 @@ choice config BR2_LINUX_KERNEL_UIMAGE bool "uImage" - depends on BR2_arm || BR2_armeb || BR2_powerpc || BR2_avr32 || BR2_sh || BR2_sh64 + depends on BR2_arm || BR2_armeb || BR2_bfin || BR2_powerpc || BR2_avr32 || BR2_sh || BR2_sh64 config BR2_LINUX_KERNEL_BZIMAGE bool "bzImage" diff --git a/linux/linux.mk b/linux/linux.mk index 2bc2efe16..9076fb917 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -31,7 +31,12 @@ LINUX26_MAKE_FLAGS = \ LINUX26_VERSION_PROBED = $(shell $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) --no-print-directory -s kernelrelease) ifeq ($(BR2_LINUX_KERNEL_UIMAGE),y) +ifeq ($(KERNEL_ARCH),blackfin) +# a uImage, but with a different file name +LINUX26_IMAGE_NAME=vmImage +else LINUX26_IMAGE_NAME=uImage +endif LINUX26_DEPENDENCIES+=$(MKIMAGE) else ifeq ($(BR2_LINUX_KERNEL_BZIMAGE),y) LINUX26_IMAGE_NAME=bzImage |