diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-03-02 01:23:36 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-03-02 01:23:36 +0000 |
| commit | 1ebe6d34880d1e26b37fe4f794b5039a8245e750 (patch) | |
| tree | c94b490dfda5ac1250f15663f2b17eeeb3924990 /target/linux/x86-2.6 | |
| parent | 9bf71c00ca3afbd968f782da24b16dbb00b2326e (diff) | |
make squashfs overlay support more generic and integrate it for x86-2.6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6450 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86-2.6')
| -rw-r--r-- | target/linux/x86-2.6/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/x86-2.6/config/default | 2 | ||||
| -rw-r--r-- | target/linux/x86-2.6/image/Makefile | 16 |
3 files changed, 15 insertions, 5 deletions
diff --git a/target/linux/x86-2.6/Makefile b/target/linux/x86-2.6/Makefile index 88b935f7b..2b8e497c9 100644 --- a/target/linux/x86-2.6/Makefile +++ b/target/linux/x86-2.6/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk ARCH=i386 BOARD:=x86 BOARDNAME:=x86 -FEATURES:=jffs2 ext2 +FEATURES:=squashfs jffs2 ext2 include $(INCLUDE_DIR)/kernel-build.mk DEFAULT_PACKAGES += kmod-natsemi diff --git a/target/linux/x86-2.6/config/default b/target/linux/x86-2.6/config/default index 768947ae7..6e2fc2fa3 100644 --- a/target/linux/x86-2.6/config/default +++ b/target/linux/x86-2.6/config/default @@ -204,7 +204,7 @@ CONFIG_M486=y # CONFIG_MGEODEGX1 is not set # CONFIG_MGEODE_LX is not set # CONFIG_MICROCODE is not set -CONFIG_MINI_FO=m +CONFIG_MINI_FO=y # CONFIG_MIXCOMWD is not set # CONFIG_MK6 is not set # CONFIG_MK7 is not set diff --git a/target/linux/x86-2.6/image/Makefile b/target/linux/x86-2.6/image/Makefile index 955a42b23..e59446472 100644 --- a/target/linux/x86-2.6/image/Makefile +++ b/target/linux/x86-2.6/image/Makefile @@ -22,18 +22,22 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y) $(MAKE) -C grub clean endef + define Image/cmdline/squashfs + block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=squashfs init=/etc/preinit + endef + define Image/cmdline/jffs2-64k - block2mtd.block2mtd=$(ROOTPART),65536 root=/dev/mtdblock0 rootfstype=jffs2 + block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=jffs2 endef define Image/cmdline/jffs2-128k - block2mtd.block2mtd=$(ROOTPART),131072 root=/dev/mtdblock0 rootfstype=jffs2 + block2mtd.block2mtd=$(ROOTPART),131072,rootfs root=/dev/mtdblock0 rootfstype=jffs2 endef define Image/cmdline/ext2 root=$(ROOTPART) rootfstype=ext2 endef - + define Image/Build/grub # left here because the image builder doesnt need these $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub @@ -46,6 +50,7 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y) -e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \ ./grub/menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(STAGING_DIR)/usr/sbin:$(STAGING_DIR)/bin:$(PATH)" ./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1) + $(call Image/Build/grub/$(1)) endef endif @@ -65,8 +70,13 @@ define Image/Prepare $(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $(KDIR)/bzImage $(call Image/Prepare/grub) endef + +define Image/Build/squashfs + $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) +endef define Image/Build + $(call Image/Build/$(1)) $(call Image/Build/grub,$(1)) $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).fs $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz |