Oops, shouldn't have committed this just yet.

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

2 files changed, 9 insertions, 9 deletions

diff --git a/firmware/target/arm/crt0-pp.S b/firmware/target/arm/crt0-pp.S
index 362d736b49..bbeace1b60 100644
--- a/firmware/target/arm/crt0-pp.S
+++ b/firmware/target/arm/crt0-pp.S
@@ -54,7 +54,7 @@ start:
 
     b      pad_skip
 
-.space 60*4 /* (more than enough) space for exception vectors and mi4 magic */
+.space 50*4 /* (more than enough) space for exception vectors */
 
 pad_skip:
 #ifdef SANSA_E200
diff --git a/tools/configure b/tools/configure
index 2343f35105..a691c98d7f 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1164,10 +1164,10 @@ EOF
     target="-DIRIVER_H10"
     memory=32 # always
     arm7tdmicc
-    tool="$rootdir/tools/scramble -mi4v3 -model=h10 -type=RBOS"
+    tool="$rootdir/tools/scramble -add=h10"
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
-    output="rockbox.mi4"
+    output="rockbox.h10"
     appextra="recorder:gui"
     archosrom=""
     flash=""
@@ -1190,10 +1190,10 @@ EOF
     target="-DIRIVER_H10_5GB"
     memory=32 # always
     arm7tdmicc
-    tool="$rootdir/tools/scramble -mi4v2 -model=h105 -type=RBOS"
+    tool="$rootdir/tools/scramble -add=h10_5gb"
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
     bmp2rb_native="$rootdir/tools/bmp2rb -f 5"
-    output="rockbox.mi4"
+    output="rockbox.h10"
     appextra="recorder:gui"
     archosrom=""
     flash=""
@@ -1216,10 +1216,10 @@ EOF
     target="-DSANSA_E200"
     memory=32 # supposedly
     arm7tdmicc
-    tool="$rootdir/tools/scramble -mi4v3 -model=e200 -type=RBOS"
+    tool="$rootdir/tools/scramble -add=e200"
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
-    output="rockbox.mi4"
+    output="rockbox.e200"
     appextra="recorder:gui"
     archosrom=""
     flash=""
@@ -1245,10 +1245,10 @@ EOF
     target="-DSANSA_E200"
     memory=32 # supposedly
     arm7tdmicc
-    tool="$rootdir/tools/scramble -mi4v3 -model=e20r -type=RBOS"
+    tool="$rootdir/tools/scramble -add=e200"
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
-    output="rockbox.mi4"
+    output="rockbox.e200"
     appextra="recorder:gui"
     archosrom=""
     flash=""