summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgroz <groz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-08-17 07:20:08 +0000
committergroz <groz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-08-17 07:20:08 +0000
commitdc8f7b0692f74559101fd004b744415384b932fd (patch)
treed136e5335a677d35a4a4c9aa54af082945374dda
parent282f9ebaca8fb2e095105f213a4b5a89a497cad0 (diff)
Build bzImage for x86 builds - allow ext2 images even if initramfs used, they are needed for creating boot images
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4579 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/image.mk12
-rw-r--r--include/kernel-build.mk2
-rw-r--r--include/kernel.mk5
3 files changed, 13 insertions, 6 deletions
diff --git a/include/image.mk b/include/image.mk
index 660734c9f..903c27ba6 100644
--- a/include/image.mk
+++ b/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/include/kernel-build.mk b/include/kernel-build.mk
index 665f0ff74..8400bd2f1 100644
--- a/include/kernel-build.mk
+++ b/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/include/kernel.mk b/include/kernel.mk
index 7b959eaea..4b5fe72f0 100644
--- a/include/kernel.mk
+++ b/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)