[backfire] uhttpd: merge r28792

[openwrt-10.03/.git] / include / image.mk

diff --git a/include/image.mk b/include/image.mk
index de5f4d84cbd5d89573a7e27e9f8f062e34c60079..ba217f52e6b94b94180298308b7bd4b65f6723d0 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -25,25 +25,6 @@ else
   SQUASHFS_OPTS :=  -le
 endif
 
-ifeq ($(CONFIG_JFFS2_RTIME),y)
-  JFFS2OPTS += -X rtime
-endif
-ifeq ($(CONFIG_JFFS2_ZLIB),y) 
-  JFFS2OPTS += -X zlib
-endif
-ifeq ($(CONFIG_JFFS2_LZMA),y)
-  JFFS2OPTS += -X lzma --compression-mode=size
-endif
-ifneq ($(CONFIG_JFFS2_RTIME),y)
-  JFFS2OPTS +=  -x rtime
-endif
-ifneq ($(CONFIG_JFFS2_ZLIB),y)
-  JFFS2OPTS += -x zlib
-endif
-ifneq ($(CONFIG_JFFS2_LZMA),y)
-  JFFS2OPTS += -x lzma
-endif
-
 ifneq ($(CONFIG_LINUX_2_4)$(CONFIG_LINUX_2_6_25),)
   USE_SQUASHFS3 := y
 endif
@@ -129,7 +110,7 @@ ifneq ($(CONFIG_TARGET_ROOTFS_TARGZ),)
 endif
 
 ifneq ($(CONFIG_TARGET_ROOTFS_EXT2FS),)
-  E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_FSPART)*1024)))
+  E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_PARTSIZE)*1024)))
 
   define Image/mkfs/ext2
                $(STAGING_DIR_HOST)/bin/genext2fs -U -b $(E2SIZE) -N $(CONFIG_TARGET_ROOTFS_MAXINODE) -d $(TARGET_DIR)/ $(KDIR)/root.ext2