Move cache code to own file

Signed-off-by: Charles Manning <cdhmanning@gmail.com>

diff --git a/Makefile b/Makefile
index 9318d4dcf7beb7cc066094817628ae0b74e8c921..5600eff5abe7eb67c6597a27e591aafe8d80c91b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,8 @@ ifneq ($(KERNELRELEASE),)
 
        obj-m := $(YAFFS_O)
 
 
        obj-m := $(YAFFS_O)
 

-       yaffs2-objs := yaffs_mtdif_single.o
+       yaffs2-objs := yaffs_cache.o
+       yaffs2-objs += yaffs_mtdif_single.o

        yaffs2-objs += yaffs_packedtags1.o
        yaffs2-objs += yaffs_ecc.o yaffs_vfs_single.o yaffs_guts.o
        yaffs2-objs += yaffs_packedtags2.o
        yaffs2-objs += yaffs_packedtags1.o
        yaffs2-objs += yaffs_ecc.o yaffs_vfs_single.o yaffs_guts.o
        yaffs2-objs += yaffs_packedtags2.o


@@ -41,7 +42,8 @@ ifneq ($(KERNELRELEASE),)
        yaffs2-objs += yaffs_endian.o
        yaffs2-objs += yaffs_summary.o
 
        yaffs2-objs += yaffs_endian.o
        yaffs2-objs += yaffs_summary.o
 

-       yaffs2multi-objs := yaffs_mtdif_multi.o
+       yaffs2multi-objs := yaffs_cache.o
+       yaffs2multi-objs += yaffs_mtdif_multi.o

        yaffs2multi-objs += yaffs_packedtags1.o
        yaffs2multi-objs += yaffs_ecc.o yaffs_vfs_multi.o yaffs_guts.o
        yaffs2multi-objs += yaffs_packedtags2.o
        yaffs2multi-objs += yaffs_packedtags1.o
        yaffs2multi-objs += yaffs_ecc.o yaffs_vfs_multi.o yaffs_guts.o
        yaffs2multi-objs += yaffs_packedtags2.o

diff --git a/direct/handle_common.sh b/direct/handle_common.sh
index 1da0c752abe0251d6670715ebc68f8c05df388e7..f46ee531339240ef78d0b461ac447c48510bb850 100755 (executable)
--- a/direct/handle_common.sh
+++ b/direct/handle_common.sh
@@ -1,7 +1,9 @@
 #! /bin/sh
 
 YAFFS_COMMON_SOURCES="\
 #! /bin/sh
 
 YAFFS_COMMON_SOURCES="\

-          yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h \
+          yaffs_ecc.c yaffs_ecc.h \
+          yaffs_cache.c yaffs_cache.h \
+          yaffs_guts.c yaffs_guts.h \

           yaffs_tagscompat.c yaffs_tagscompat.h \
           yaffs_tagsmarshall.c yaffs_tagsmarshall.h \
           yaffs_packedtags1.c yaffs_packedtags1.h \
           yaffs_tagscompat.c yaffs_tagscompat.h \
           yaffs_tagsmarshall.c yaffs_tagsmarshall.h \
           yaffs_packedtags1.c yaffs_packedtags1.h \

diff --git a/direct/test-framework/FrameworkRules.mk b/direct/test-framework/FrameworkRules.mk
index d11673bf3fd7a12c57b43c26b090e0194ecdb29e..48e1475b4fd22d087013beada696cf821889e212 100644 (file)
--- a/direct/test-framework/FrameworkRules.mk
+++ b/direct/test-framework/FrameworkRules.mk
@@ -35,6 +35,7 @@ COMMONTESTOBJS = yaffscfg2k.o yaffs_osglue.o yaffs_hweight.o yaffs_error.o\
                 yaffs_packedtags1.o yaffs_ramdisk.o yaffs_ramem2k.o \
                 yaffs_tagscompat.o yaffs_tagsmarshall.o \
                 yaffs_packedtags2.o yaffs_nand.o \
                 yaffs_packedtags1.o yaffs_ramdisk.o yaffs_ramem2k.o \
                 yaffs_tagscompat.o yaffs_tagsmarshall.o \
                 yaffs_packedtags2.o yaffs_nand.o \

+                yaffs_cache.o \

                 yaffs_checkptrw.o  \
                 yaffs_endian.o \
                 yaffs_nameval.o yaffs_attribs.o \
                 yaffs_checkptrw.o  \
                 yaffs_endian.o \
                 yaffs_nameval.o yaffs_attribs.o \


@@ -57,6 +58,7 @@ YAFFSDIRECTSYMLINKS =  \
           yaffsfs.c yaffs_flashif.h yaffs_flashif2.h\
           yaffsfs.h yaffs_osglue.h ydirectenv.h \
           yaffscfg.h \
           yaffsfs.c yaffs_flashif.h yaffs_flashif2.h\
           yaffsfs.h yaffs_osglue.h ydirectenv.h \
           yaffscfg.h \

+         yaffs_cache.c yaffs_cache.h\

           yaffs_nandemul2k.h yaffs_list.h \
           yaffs_attribs.c \
           yportenv.h \
           yaffs_nandemul2k.h yaffs_list.h \
           yaffs_attribs.c \
           yportenv.h \