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

SVN-Revision: 4579
This commit is contained in:
Gerry Rozema 2006-08-17 07:20:08 +00:00
parent 3300149aed
commit 0d4a346652
3 changed files with 14 additions and 7 deletions

View File

@ -45,15 +45,17 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
endef endef
endif 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
endif 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
define Image/mkfs/prepare/default define Image/mkfs/prepare/default
find $(BUILD_DIR)/root -type f -not -perm +0100 | xargs chmod 0644 find $(BUILD_DIR)/root -type f -not -perm +0100 | xargs chmod 0644
find $(BUILD_DIR)/root -type f -perm +0100 | xargs chmod 0755 find $(BUILD_DIR)/root -type f -perm +0100 | xargs chmod 0755

View File

@ -63,7 +63,7 @@ else
endif endif
$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config $(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 $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
$(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@

View File

@ -38,6 +38,11 @@ else
-e 's/armeb/arm/' \ -e 's/armeb/arm/' \
) )
KERNELNAME=""
ifneq (,$(findstring x86,$(BOARD)))
KERNELNAME="bzImage"
endif
ifneq (,$(findstring uml,$(BOARD))) ifneq (,$(findstring uml,$(BOARD)))
LINUX_KARCH:=um LINUX_KARCH:=um
KERNEL_CC:=$(HOSTCC) KERNEL_CC:=$(HOSTCC)