yaffs: more clean up

[yaffs2.git] / patch-ker.sh

diff --git a/patch-ker.sh b/patch-ker.sh
index 58940874862e207d9741f801df8985d563d2bd33..ba6b6e483ce7fb8b35a5635e6af133236a5317a3 100755 (executable)
--- a/patch-ker.sh
+++ b/patch-ker.sh
@@ -53,9 +53,16 @@ else
 fi
 
 if [ $MULTIORSINGLE = m ]; then
-   VFSGLUE="yaffs_vfs_multi.c"
+   VFS_CODE="yaffs_vfs_multi.c"
+   MTD1_CODE="yaffs_mtdif1_multi.c"
+   MTD2_CODE="yaffs_mtdif2_multi.c"
+   YPORTENV="yportenv_multi.h"
 elif [ $MULTIORSINGLE = s ]; then
-   VFSGLUE="yaffs_vfs.c"
+   VFS_CODE="yaffs_vfs_single.c"
+   MTD1_CODE="yaffs_mtdif1_single.c"
+   MTD2_CODE="yaffs_mtdif2_single.c"
+   YPORTENV="yportenv_single.h"
+
    echo ""
    echo "*** Warning ***"
    echo "You have chosen to use the single kernel variant of the yaffs VFS glue code"
@@ -112,17 +119,17 @@ else
     echo "Updating $KCONFIG"
     mv -f $KCONFIG  $KCONFIGOLD
     sed -n -e "/[Jj][Ff][Ff][Ss]/,99999 ! p" $KCONFIGOLD >$KCONFIG
-    echo "">>$KCONFIG
-    echo "# Patched by YAFFS" >>$KCONFIG
+    # echo "">>$KCONFIG
+    # echo "# Patched by YAFFS" >>$KCONFIG
     echo "source \"fs/yaffs2/Kconfig\"">>$KCONFIG
-    echo "">>$KCONFIG
+    # echo "">>$KCONFIG
     sed -n -e "/[Jj][Ff][Ff][Ss]/,99999 p" $KCONFIGOLD >>$KCONFIG
 
    # now do fs/Makefile -- simply add the target at the end
     echo "Updating $MAKEFILE"
     cp -f $MAKEFILE $MAKEFILEOLD
-    echo "">>$MAKEFILE
-    echo "# Patched by YAFFS" >>$MAKEFILE
+    # echo "">>$MAKEFILE
+    # echo "# Patched by YAFFS" >>$MAKEFILE
     echo "obj-\$(CONFIG_YAFFS_FS)              += yaffs2/" >>$MAKEFILE
 
 fi
@@ -135,10 +142,16 @@ then
    echo "already there then delete $YAFFSDIR and re-run this script"
    echo " eg.  \"rm -rf $YAFFSDIR\" "
 else
+   rm yaffs*.mod.c
    mkdir $LINUXDIR/fs/yaffs2
    $CPY  $PWD/Makefile.kernel $LINUXDIR/fs/yaffs2/Makefile
    $CPY $PWD/Kconfig $LINUXDIR/fs/yaffs2
    $CPY $PWD/*.c $PWD/*.h  $LINUXDIR/fs/yaffs2
-   rm $LINUXDIR/fs/yaffs2/yaffs_vfs.c $LINUXDIR/fs/yaffs2/yaffs_vfs_multi.c
-   $CPY $PWD/$VFSGLUE $LINUXDIR/fs/yaffs2/yaffs_vfs_glue.c
+   rm $LINUXDIR/fs/yaffs2/yaffs_vfs*.c $LINUXDIR/fs/yaffs2/yaffs_mtdif[12]*.c
+   rm $LINUXDIR/fs/yaffs2/yportenv*.h
+   rm $LINUXDIR/fs/yaffs2/moduleconfig.h
+   $CPY $PWD/$VFS_CODE $LINUXDIR/fs/yaffs2/yaffs_vfs.c
+   $CPY $PWD/$MTD1_CODE $LINUXDIR/fs/yaffs2/yaffs_mtdif1.c
+   $CPY $PWD/$MTD2_CODE $LINUXDIR/fs/yaffs2/yaffs_mtdif2.c
+   $CPY $PWD/$YPORTENV $LINUXDIR/fs/yaffs2/yportenv.h
 fi