From d2fdd8bd46f4d07da061195152785aa7309abcf1 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 30 Jan 2007 17:38:41 +0000 Subject: [PATCH] - honor the given kernel format and fallback to zImage if none was specified --- target/linux26.mk | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/target/linux26.mk b/target/linux26.mk index f5a2123e48..79023d7c6d 100644 --- a/target/linux26.mk +++ b/target/linux26.mk @@ -22,7 +22,12 @@ LINUX26_SITE=http://ftp.kernel.org/pub/linux/kernel/v2.6 #LINUX26_FORMAT=vmlinux #LINUX26_BINLOC=$(LINUX26_FORMAT) -LINUX26_FORMAT=bzImage + +# Has to be set by the target/device +# LINUX26_FORMAT=bzImage +ifndef LINUX26_FORMAT +LINUX26_FORMAT=zImage +endif LINUX26_BINLOC=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT) # Linux kernel configuration file @@ -72,6 +77,11 @@ endif # ($(LINUX26_VERSION),$(LINUX_HEADERS_VERSION)) $(LINUX26_DIR)/.configured: $(LINUX26_DIR)/.patched $(LINUX26_KCONFIG) -cp $(LINUX26_KCONFIG) $(LINUX26_DIR)/.config + $(SED) 's,^CONFIG_EABI.*,# CONFIG_EABI is not set,g' \ + $(LINUX26_DIR)/.config +ifeq ($(BR2_ARM_EABI),y) + echo "CONFIG_EABI=y" >> $(LINUX26_DIR)/.config +endif $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) oldconfig touch $(LINUX26_DIR)/.configured @@ -80,7 +90,7 @@ $(LINUX26_DIR)/.depend_done: $(LINUX26_DIR)/.configured touch $(LINUX26_DIR)/.depend_done $(LINUX26_KERNEL): $(LINUX26_DIR)/.depend_done - $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) $(LINUX26_FORMAT) bzImage + $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) $(LINUX26_FORMAT) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) modules cp -fa $(LINUX26_DIR)/$(LINUX26_BINLOC) $(LINUX26_KERNEL) touch -c $(LINUX26_KERNEL) -- 2.30.2