Fix the bootloader, and give the M:Robe it's own scramble

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14922 a1c6a512-1295-4272-9138-f99709370657

firmware/boot.lds

@@ -10,7 +10,7 @@ OUTPUT_ARCH(arm)
 #ifdef CPU_PP
 INPUT(target/arm/crt0-pp-bl.o)
 #elif defined(OLYMPUS_MROBE_500)
-INPUT(target/arm/tms320dm320/mrobe-500/crt0.o)
+INPUT(target/arm/tms320dm320/crt0.o)
 #else
 INPUT(target/arm/crt0.o)
 #endif

firmware/export/config-mrobe500.h

@@ -27,7 +27,7 @@
 #define OLYMPUS_MROBE_500 1
 
 /* For Rolo and boot loader */
-#define MODEL_NUMBER 19
+#define MODEL_NUMBER 22
 
 /* define this if you have a bitmap LCD display */
 #define HAVE_LCD_BITMAP

tools/configure

@@ -1287,7 +1287,7 @@ EOF
     target="-DMROBE_500"
     memory=64 # always
     arm9tdmicc
-    tool="$rootdir/tools/scramble -add=giga"
+    tool="$rootdir/tools/scramble -add=m500"
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox.mrobe500"

tools/scramble.c

@@ -107,7 +107,7 @@ void usage(void)
            "\t-add=X  Rockbox generic \"add-up\" checksum format\n"
            "\t        (X values: h100, h120, h140, h300, ipco, nano, ipvd, mn2g\n"
            "\t                   ip3g, ip4g, mini, iax5, h10, h10_5gb, tpj2,\n"
-           "\t                   c200, e200)\n"
+           "\t                   c200, e200, giga, m500)\n"
            "\nNo option results in Archos standard player/recorder format.\n");
 
     exit(1);
@@ -249,8 +249,10 @@ int main (int argc, char** argv)
             modelnum = 19;
         else if(!strcmp(&argv[1][5], "c200"))
             modelnum = 20;
-	     else if(!strcmp(&argv[1][5], "gigs"))
+        else if(!strcmp(&argv[1][5], "gigs"))
             modelnum = 21;
+        else if(!strcmp(&argv[1][5], "m500"))
+            modelnum = 22;
         else {
             fprintf(stderr, "unsupported model: %s\n", &argv[1][5]);
             return 2;