Build bzImage for x86 builds - allow ext2 images even if initramfs used, they are...

SVN-Revision: 4579

diff --git a/openwrt/include/image.mk b/openwrt/include/image.mk
index 660734c9f7a9ddad9644a2e4c0ab5c64df2552f2..903c27ba6333d52376cbcd5de20f2094c5e2429b 100644 (file)
--- 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 665f0ff7440ceff0b4fbb50eb5e3c703db0ad866..8400bd2f1e88b8fd074a216de3dc6fa0509fd8d7 100644 (file)
--- 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 7b959eaeaacf43935b304c0d93dac599c70aef37..4b5fe72f0097ec11591644bfe46c44397215ff6e 100644 (file)
--- 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)