2 files changed, 45 insertions, 1 deletions

diff --git a/tools/configure b/tools/configure
index c34ecec382..36597f524b 100755
--- a/tools/configure
+++ b/tools/configure
@@ -694,6 +694,8 @@ cat <<EOF
  33) Cowon D2                                    53) Sansa m200
  34) M3/M3L                                      54) Sansa c100
                                                  55) Sansa Clip
+                                                 56) Sansa e200v2
+                                                 57) Sansa m200v2
 
  ==Tatung==               ==Olympus==            ==Logik==
  60) Elio TPJ-1022        70) M:Robe 500         80) DAX 1GB MP3/DAB
@@ -1698,6 +1700,46 @@ fi
     ;;
 
 
+   56|e200v2)
+    target_id=51
+    modelname="e200v2"
+    target="-DSANSA_E200V2"
+    memory=2 # FIXME - a guess
+    arm9tdmicc
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$bmp2rb_mono"
+    tool="$rootdir/tools/scramble -add=e2v2"
+    output="rockbox.sansa"
+    bootoutput="bootloader-e200v2.sansa"
+    appextra="recorder:gui"
+    plugins=""
+    toolset=$scramblebitmaptools
+    t_cpu="arm"
+    t_manufacturer="as3525"
+    t_model="sansa-clip"
+    ;;
+
+
+   57|m200v2)
+    target_id=52
+    modelname="m200v2"
+    target="-DSANSA_M200V2"
+    memory=2 # FIXME - A guess
+    arm9tdmicc
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$bmp2rb_mono"
+    tool="$rootdir/tools/scramble -add=m2v2"
+    output="rockbox.sansa"
+    bootoutput="bootloader-m200v2.sansa"
+    appextra="recorder:gui"
+    plugins=""
+    toolset=$scramblebitmaptools
+    t_cpu="arm"
+    t_manufacturer="as3525"
+    t_model="sansa-m200v2"
+    ;;
+
+
    60|tpj1022)
     target_id=25
     modelname="tpj1022"
diff --git a/tools/scramble.c b/tools/scramble.c
index 429823aaa7..aaf3b9d232 100644
--- a/tools/scramble.c
+++ b/tools/scramble.c
@@ -122,7 +122,7 @@ void usage(void)
            "\t        (X values: h100, h120, h140, h300, ipco, nano, ipvd, mn2g\n"
            "\t                   ip3g, ip4g, mini, iax5, iam5, iam3, h10, h10_5gb,\n"
            "\t                   tpj2, c200, e200, giga, gigs, m100, m500, d2,\n");
-    printf("\t                   9200, 1630, ldax, m200, clip, e2v2)\n");
+    printf("\t                   9200, 1630, ldax, m200, clip, e2v2, m2v2)\n");
     printf("\nNo option results in Archos standard player/recorder format.\n");
 
     exit(1);
@@ -289,6 +289,8 @@ int main (int argc, char** argv)
             modelnum = 50;
         else if (!strcmp(&argv[1][5], "e2v2"))
             modelnum = 51;
+        else if (!strcmp(&argv[1][5], "m2v2"))
+            modelnum = 52;
         else {
             fprintf(stderr, "unsupported model: %s\n", &argv[1][5]);
             return 2;