aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGerry Rozema <gerryr@rozeware.com>2006-07-20 21:06:47 +0000
committerGerry Rozema <gerryr@rozeware.com>2006-07-20 21:06:47 +0000
commit42fb2160c46f0bd58ab25972956ee0fffa5d8461 (patch)
treef5796f661d2a6ed126170f59624c311d0a6c5b07 /include
parentae823241fe1ab7c8c52b59b5768161935b3b5051 (diff)
downloadupstream-42fb2160c46f0bd58ab25972956ee0fffa5d8461.tar.gz
upstream-42fb2160c46f0bd58ab25972956ee0fffa5d8461.tar.bz2
upstream-42fb2160c46f0bd58ab25972956ee0fffa5d8461.zip
UML target completed. Added ext2 target fs for use with uml images
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4178 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
-rw-r--r--include/image.mk9
-rw-r--r--include/kernel-build.mk4
-rw-r--r--include/kernel.mk5
-rw-r--r--include/target.mk1
4 files changed, 17 insertions, 2 deletions
diff --git a/include/image.mk b/include/image.mk
index 95accd6e1d..54f0e8b6bc 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -44,6 +44,14 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
tar -zcf $(BIN_DIR)/openwrt-rootfs.tgz --owner=root --group=root -C $(BUILD_DIR)/root/ .
endef
endif
+
+ ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y)
+ define Image/mkfs/ext2
+ genext2fs -q -b 4096 -I 1500 -d $(BUILD_DIR)/root/ $(KDIR)/root.ext2
+ $(call Image/Build,ext2)
+ endef
+ endif
+
endif
define Image/mkfs/prepare/default
@@ -69,6 +77,7 @@ install:
$(call Image/mkfs/jffs2)
$(call Image/mkfs/squashfs)
$(call Image/mkfs/tgz)
+ $(call Image/mkfs/ext2)
clean:
$(call Build/Clean)
diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 942a91516b..f46e7f0ff3 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -72,13 +72,13 @@ $(LINUX_DIR)/vmlinux: $(STAMP_DIR)/.linux-compile pkg-install ramdisk-config
$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH)
$(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
- $(TARGET_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 $< $@
touch -c $(LINUX_KERNEL)
$(LINUX_DIR)/.modules_done:
rm -rf $(KERNEL_BUILD_DIR)/modules
$(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules
- $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
+ $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
touch $(LINUX_DIR)/.modules_done
modules: $(LINUX_DIR)/.modules_done
diff --git a/include/kernel.mk b/include/kernel.mk
index 2c5d093778..318ca6869d 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -28,6 +28,11 @@ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
-e 's/armeb/arm/' \
)
+ifneq (,$(findstring uml,$(BOARD)))
+LINUX_KARCH="um"
+KERNEL_CROSS=
+endif
+
KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
diff --git a/include/target.mk b/include/target.mk
index 44ff11128a..95bd1dbfb3 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -18,6 +18,7 @@ $(eval $(call kernel_template,2.6,brcm,2_6_BRCM))
$(eval $(call kernel_template,2.6,brcm63xx,2_6_BRCM63XX))
$(eval $(call kernel_template,2.6,rb532,2_6_RB532))
$(eval $(call kernel_template,2.6,x86,2_6_X86))
+$(eval $(call kernel_template,2.6,uml,2_6_UML))
$(eval $(call kernel_template,2.4,ar531x,2_4_AR531X))
$(eval $(call kernel_template,2.6,aruba,2_6_ARUBA))
$(eval $(call kernel_template,2.6,au1000,2_6_AU1000))