From 0d4a34665278432089f9905f88f3bd8bcf57eacd Mon Sep 17 00:00:00 2001
From: Gerry Rozema <groz@openwrt.org>
Date: Thu, 17 Aug 2006 07:20:08 +0000
Subject: [PATCH] Build bzImage for x86 builds - allow ext2 images even if
 initramfs used, they are needed for creating boot images

SVN-Revision: 4579
---
 openwrt/include/image.mk        | 12 +++++++-----
 openwrt/include/kernel-build.mk |  2 +-
 openwrt/include/kernel.mk       |  5 +++++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/openwrt/include/image.mk b/openwrt/include/image.mk
index 660734c9f7..903c27ba63 100644
--- a/openwrt/include/image.mk
+++ b/openwrt/include/image.mk
@@ -45,15 +45,17 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
     endef
   endif
   
-  ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y)
-    define Image/mkfs/ext2
+  
+endif
+
+ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y)
+  define Image/mkfs/ext2
 		$(STAGING_DIR)/bin/genext2fs -q -b 8192 -I 1500 -d $(BUILD_DIR)/root/ $(KDIR)/root.ext2
 		$(call Image/Build,ext2)
-    endef
-  endif
-  
+  endef
 endif
 
+
 define Image/mkfs/prepare/default
 	find $(BUILD_DIR)/root -type f -not -perm +0100 | xargs chmod 0644
 	find $(BUILD_DIR)/root -type f -perm +0100 | xargs chmod 0755
diff --git a/openwrt/include/kernel-build.mk b/openwrt/include/kernel-build.mk
index 665f0ff744..8400bd2f1e 100644
--- a/openwrt/include/kernel-build.mk
+++ b/openwrt/include/kernel-build.mk
@@ -63,7 +63,7 @@ else
 endif
 
 $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config
-	$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) 
+	$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) $(KERNELNAME)
 
 $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
 	$(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@
diff --git a/openwrt/include/kernel.mk b/openwrt/include/kernel.mk
index 7b959eaeaa..4b5fe72f00 100644
--- a/openwrt/include/kernel.mk
+++ b/openwrt/include/kernel.mk
@@ -38,6 +38,11 @@ else
 	-e 's/armeb/arm/' \
   )
 
+  KERNELNAME=""
+  ifneq (,$(findstring x86,$(BOARD)))
+    KERNELNAME="bzImage"
+  endif
+
   ifneq (,$(findstring uml,$(BOARD)))
     LINUX_KARCH:=um
     KERNEL_CC:=$(HOSTCC)