Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2

diff --combined direct/test-framework/FrameworkRules.mk
index 29eb44df5d32857b232894c27baa34d174628eaa,4532aa81836e5958309c1a8ebdcc9604d1aefc26..3b6088a21c15bdd52bfa152f4e5e13e9f2d01267
--- 1/direct/test-framework/FrameworkRules.mk
--- 2/direct/test-framework/FrameworkRules.mk
+++ b/direct/test-framework/FrameworkRules.mk
@@@ -29,7 -29,7 +29,7 @@@ CFLAGS +=    -Wextra -Wpointer-arit
  #CFLAGS+=   -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winline
  
  
- COMMONTESTOBJS = yaffscfg2k.o yaffs_osglue.o yaffs_hweight.o\
+ COMMONTESTOBJS = yaffscfg2k.o yaffs_osglue.o yaffs_hweight.o yaffs_error.o\
                 yaffs_ecc.o yaffs_fileem.o yaffs_fileem2k.o yaffsfs.o yaffs_guts.o \
                 yaffs_packedtags1.o yaffs_ramdisk.o yaffs_ramem2k.o \
                 yaffs_tagscompat.o yaffs_tagsmarshall.o \
@@@ -37,9 -37,6 +37,9 @@@
                 yaffs_checkptrw.o  yaffs_qsort.o\
                 yaffs_nameval.o yaffs_attribs.o \
                 yaffs_m18_drv.o  yaffs_nor_drv.o ynorsim.o \
 +               yaffs_nand_drv.o \
 +               nanddrv.o nandsim.o \
 +               nandsim_file.o nandstore_file.o \
                 yaffs_allocator.o \
                 yaffs_bitmap.o \
                 yaffs_yaffs1.o \
@@@ -59,6 -56,7 +59,7 @@@ YAFFSDIRECTSYMLINKS =  
            yaffs_attribs.c \
            yaffs_nandif.c yaffs_nandif.h yportenv.h \
            yaffs_hweight.c yaffs_hweight.h \
+         yaffs_error.c \
            yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h \
            yaffs_tagscompat.c yaffs_tagscompat.h \
            yaffs_tagsmarshall.c yaffs_tagsmarshall.h \
@@@ -80,16 -78,13 +81,16 @@@ FRAMEWORKEXTRASYMLINKS = 
                yaffscfg2k.c yaffs_fileem2k.c yaffs_fileem2k.h\
                yaffs_fileem.c yaffs_m18_drv.c yaffs_m18_drv.h \
                yaffs_nor_drv.c yaffs_nor_drv.h \
 +              yaffs_nand_drv.c yaffs_nand_drv.h \
                yaffs_ramdisk.c yaffs_ramdisk.h yaffs_ramem2k.c \
 +              nand_chip.h nanddrv.c nanddrv.h nandsim.c nandsim.h nand_store.h \
 +              nandsim_file.c nandsim_file.h nandstore_file.c nandstore_file.h \
                ynorsim.h ynorsim.c yaffs_osglue.c
  
  FRAMEWORK_SOURCES = $(YAFFSDIRECTSYMLINKS) $(FRAMEWORKEXTRASYMLINKS)
  
  clean:
-       rm -f $(TARGETS) $(ALLOBJS) core $(FRAMEWORK_SOURCES)
+       rm -f $(TARGETS) $(ALLOBJS) core $(FRAMEWORK_SOURCES) $(CLEAN_OBJS)
  
  $(YAFFSDIRECTSYMLINKS):
        ln -s $(YDI_DIR)/$@ $@