X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=patch-ker.sh;h=3da6925fd42163b92c6b26cf4e1a66b397e4accb;hp=6ffabecd2ff1ca0da1e46ebba09f2552740b879c;hb=6014fce5c65757724aef9033f2a710da324f2523;hpb=a6c3366bdc908169673539dcb464369061ed5eb8

diff --git a/patch-ker.sh b/patch-ker.sh
index 6ffabec..3da6925 100755
--- a/patch-ker.sh
+++ b/patch-ker.sh
@@ -2,35 +2,37 @@
 #
 # YAFFS: Yet another FFS. A NAND-flash specific file system.
 #
-# Copyright (C) 2002-2006 Aleph One Ltd.
-# 
+# Copyright (C) 2002-2010 Aleph One Ltd.
+#
 # Created by Charles Manning <charles@aleph1.co.uk>
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
 #
 # Patch YAFFS into the kernel
 #
-#  args:  kpath  : Full path to kernel sources to be patched
+#  args:  l/c : link or copy
+#	  kpath  : Full path to kernel sources to be patched
 #
 #  Somewhat "inspired by" the mtd patchin script
 #
-#  $Id: patch-ker.sh,v 1.3 2007-07-25 01:04:38 charles Exp $
 
 VERSION=0
 PATCHLEVEL=0
 SUBLEVEL=0
 COPYORLINK=$1
-LINUXDIR=$2
+MULTIORSINGLE=$2
+LINUXDIR=$3
 
 # To be a Linux directory, it must have a Makefile
 
 
 # Display usage of this script
 usage () {
-	echo "usage:  $0  c/l kernelpath"
+	echo "usage:  $0  c/l m/s kernelpath"
 	echo " if c/l is c, then copy. If l then link"
+	echo " if m/s is m, then use multi version code. If s then use single version code"
 	exit 1
 }
 
@@ -50,10 +52,34 @@ else
    usage;
 fi
 
+if [ $MULTIORSINGLE = m ]; then
+   VFS_CODE="yaffs_vfs_multi.c"
+   MTD_CODE="yaffs_mtdif_multi.c"
+   YPORTENV="yportenv_multi.h"
+   KCONFIG_SRC="Kconfig_multi"
+elif [ $MULTIORSINGLE = s ]; then
+   VFS_CODE="yaffs_vfs_single.c"
+   MTD_CODE="yaffs_mtdif_single.c"
+   YPORTENV="yportenv_single.h"
+   KCONFIG_SRC="Kconfig_single"
+
+   echo ""
+   echo "*** Warning ***"
+   echo "You have chosen to use the single kernel variant of the yaffs VFS glue code"
+   echo "that only works with the latest Linux kernel tree. If you are using an older"
+   echo "version of Linux then you probably wanted to use the multi-version variant by"
+   echo "re-running the patch-ker.sh script using m as a the second argument."
+   echo " ie $0 $COPYORLINK m $LINUXDIR"
+   echo ""
+else
+   echo "unknown multi/single version selection"
+   usage;
+fi
+
 
 # Check if kerneldir contains a Makefile
-if [ ! -f $LINUXDIR/Makefile ] 
-then 
+if [ ! -f $LINUXDIR/Makefile ]
+then
 	echo "Directory $LINUXDIR does not exist or is not a kernel source directory";
 	exit 1;
 fi
@@ -64,8 +90,8 @@ PATCHLEVEL=`grep -s PATCHLEVEL <$LINUXDIR/Makefile | head -n 1 | sed s/'PATCHLEV
 SUBLEVEL=`grep -s SUBLEVEL <$LINUXDIR/Makefile | head -n 1 | sed s/'SUBLEVEL = '//`
 
 # Can we handle this version?
-if [ $VERSION -ne 2  -o $PATCHLEVEL -lt 6  ]
-then 
+if [ $VERSION$PATCHLEVEL -lt 26  ]
+then
 	echo "Cannot patch kernel version $VERSION.$PATCHLEVEL.$SUBLEVEL, must be 2.6.x or higher"
 	exit 1;
 fi
@@ -92,18 +118,18 @@ else
     YAFFS_PATCHED=1
     echo "Updating $KCONFIG"
     mv -f $KCONFIG  $KCONFIGOLD
-    sed -n -e "/JFFS/,99999 ! p" $KCONFIGOLD >$KCONFIG
-    echo "">>$KCONFIG
-    echo "# Patched by YAFFS" >>$KCONFIG
+    sed -n -e "/[Jj][Ff][Ff][Ss]/,99999 ! p" $KCONFIGOLD >$KCONFIG
+    # echo "">>$KCONFIG
+    # echo "# Patched by YAFFS" >>$KCONFIG
     echo "source \"fs/yaffs2/Kconfig\"">>$KCONFIG
-    echo "">>$KCONFIG
-    sed -n -e "/JFFS/,99999 p" $KCONFIGOLD >>$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
@@ -112,10 +138,19 @@ YAFFSDIR=$LINUXDIR/fs/yaffs2
 
 if [ -e $YAFFSDIR ]
 then
-   echo "$YAFFSDIR exists, not patching"
+   echo "$YAFFSDIR exists, so not patching. If you want to replace what is"
+   echo "already there then delete $YAFFSDIR and re-run this script"
+   echo " eg.  \"rm -rf $YAFFSDIR\" "
 else
+   rm yaffs*.mod.c 2> /dev/null
    mkdir $LINUXDIR/fs/yaffs2
    $CPY  $PWD/Makefile.kernel $LINUXDIR/fs/yaffs2/Makefile
-   $CPY $PWD/Kconfig $LINUXDIR/fs/yaffs2
+   $CPY $PWD/$KCONFIG_SRC $LINUXDIR/fs/yaffs2/Kconfig
    $CPY $PWD/*.c $PWD/*.h  $LINUXDIR/fs/yaffs2
+   rm $LINUXDIR/fs/yaffs2/yaffs_vfs*.c $LINUXDIR/fs/yaffs2/yaffs_mtdif*.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/$MTD_CODE $LINUXDIR/fs/yaffs2/yaffs_mtdif.c
+   $CPY $PWD/$YPORTENV $LINUXDIR/fs/yaffs2/yportenv.h
 fi