X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=Makefile;h=a210c1e4b63a08c801b89ed070c1545ff0495da5;hp=b885130ea5705f541038a52c230b0dc2259105f6;hb=71735099f6e4f4eb6037852a0590223224f22382;hpb=28d4bda659460575eb5fcf7de394209531f1a950

diff --git a/Makefile b/Makefile
index b885130..a210c1e 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@
 # it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
 #
-# $Id: Makefile,v 1.3 2005-07-18 23:16:04 charles Exp $
+# $Id: Makefile,v 1.6 2005-08-01 20:54:45 luc Exp $
 #
 
 ## Change or override  KERNELDIR to your kernel
@@ -30,36 +30,18 @@ LD=$(MAKETOOLS)ld
 # Comment out the stuff you don't want.
 #
 
-# CONFIG_YAFFS_RAM_ENABLED.
-# This adds the yaffsram file system support. Nice for testing on x86, but uses 2MB of RAM.
-# Don't enable for NAND-based targets.
+# CONFIG_YAFFS_YAFFS1
+# This adds the yaffs file system support for working with a
+# a 512 byte / page NAND mtd.
 
-USE_RAM_FOR_TEST = -DCONFIG_YAFFS_RAM_ENABLED
+USE_MTD = -DCONFIG_YAFFS_YAFFS1
 
+# CONFIG_YAFFS_YAFFS2
+# This adds the yaffs2 file system support for working with a 
+# 2048 or larger byte / page NAND mtd.
 
-# CONFIG_YAFFS_MTD_ENABLED.
-# This adds the yaffs file system support for working with a NAND mtd.
+USE_MTD_2 = -DCONFIG_YAFFS_YAFFS2
 
-USE_MTD = -DCONFIG_YAFFS_MTD_ENABLED
-
-# CONFIG_YAFFS2_RAM_ENABLED.
-# This adds the yaffs2ram file system support. Nice for testing on x86, but uses 2MB of RAM.
-# Don't enable for NAND-based targets.
-
-USE_RAM_FOR_TEST_2 = -DCONFIG_YAFFS2_RAM_ENABLED
-
-
-# CONFIG_YAFFS2_MTD_ENABLED.
-# This adds the yaffs2 file system support for working with a NAND mtd.
-
-USE_MTD_2 = -DCONFIG_YAFFS2_MTD_ENABLED
-
-# CONFIG_YAFFS_USE_OLD_MTD
-# Enable this to use the old MTD stuff that did not have yaffs support.
-# You can use this to get around compilation problems, but the best
-# thing to do is to upgrade your MTD support. You will get better speed.
-
-#USE_OLD_MTD = -DCONFIG_YAFFS_USE_OLD_MTD
 
 # CONFIG_YAFFS_USE_NANDECC
 # This enables the ECC functions of the generic MTD-NAND driver.
@@ -113,10 +95,10 @@ WIERD_COMPILE_CONFIGS = -DNR_IRQS=1 -DNR_IRQ_VECTORS=1
 YAFFS_CONFIGS = $(WIERD_COMPILE_CONFIGS) \
                 $(USE_RAM_FOR_TEST) $(USE_MTD) $(USE_RAM_FOR_TEST_2) $(USE_MTD_2)\
                 $(USE_HEADER_FILE_SIZE) $(IGNORE_CHUNK_ERASED) $(IGNORE_WRITE_VERIFY) \
-                $(ENABLE_SHORT_NAMES_IN_RAM) $(USE_NANDECC) $(USE_OLD_MTD) $(USE_WRONGECC)
+                $(ENABLE_SHORT_NAMES_IN_RAM) $(USE_NANDECC) $(USE_WRONGECC)
 
 
-YAFFS2_CONFIGS = $(YAFFS_CONFIGS) -DCONFIG_YAFFS_YAFFS2
+YAFFS2_CONFIGS = $(YAFFS_CONFIGS)
 
 CFLAGS = -D__KERNEL__ -DMODULE $(YAFFS2_CONFIGS)  -I$(KERNELDIR)/include -O2 -g -Wall