yaffs: more clean up

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

diff --git a/patch-ker.sh b/patch-ker.sh
index 0cfa9d97207548d5558b923857c519e1ee2b6b7b..ba6b6e483ce7fb8b35a5635e6af133236a5317a3 100755 (executable)
--- a/patch-ker.sh
+++ b/patch-ker.sh
@@ -119,17 +119,17 @@ else
     echo "Updating $KCONFIG"
     mv -f $KCONFIG  $KCONFIGOLD
     sed -n -e "/[Jj][Ff][Ff][Ss]/,99999 ! p" $KCONFIGOLD >$KCONFIG
     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 "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
     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
     echo "obj-\$(CONFIG_YAFFS_FS)              += yaffs2/" >>$MAKEFILE
 
 fi


@@ -142,12 +142,14 @@ then
    echo "already there then delete $YAFFSDIR and re-run this script"
    echo " eg.  \"rm -rf $YAFFSDIR\" "
 else
    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_mtdif[12]*.c
    rm $LINUXDIR/fs/yaffs2/yportenv*.h
    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_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/$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

diff --git a/yportenv.h b/yportenv.h
deleted file mode 120000 (symlink)
index b21fbc6..0000000
--- a/yportenv.h
+++ /dev/null
@@ -1 +0,0 @@
-yportenv_multi.h
\ No newline at end of file