Index: firmware/crt0.S
===================================================================
RCS file: /cvsroot/rockbox/firmware/crt0.S,v
retrieving revision 1.72
diff -u -b -r1.72 crt0.S
--- firmware/crt0.S	20 Mar 2006 00:39:19 -0000	1.72
+++ firmware/crt0.S	3 Jun 2006 01:30:57 -0000
@@ -69,7 +69,12 @@
     ldr    r3, =0x3f84     /* r3 and r1 values here are magic, don't touch */
     orr    r3, r3, r5      /* adjust for execute address */
     ldr    r2, =0xf000f014
+#if MEM > 32
+    mov    r1, #0x7400     /* r1 appears to indicate how much memory (not in
+                              bytes) is remapped */
+#else
     mov    r1, #0x3a00
+#endif
     ldr    r0, =0xf000f010
     mov    pc, #0x40000000 
     
Index: configure
===================================================================
RCS file: /cvsroot/rockbox/tools/configure,v
retrieving revision 1.200
diff -u -r1.200 configure
--- configure	3 Aug 2006 08:08:40 -0000	1.200
+++ configure	3 Aug 2006 19:01:18 -0000
@@ -764,7 +764,6 @@
    15)
     archos="ipodvideo"
     target="-DIPOD_VIDEO"
-    memory=32 # 30GB models have 32MB, 60GB have 64MB
     arm7tdmicc
     tool="$rootdir/tools/scramble -add=ipvd"
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
@@ -939,6 +938,7 @@
     t_model="sansa-e200"
     ;;
 
+
    *)
     echo "Please select an actual target platform!"
     exit
@@ -956,19 +956,32 @@
 if [ -z "$memory" ]; then
   size="2"
   if [ -z "$update" ]; then
-    echo "Enter size of your RAM (in MB): (defaults to 2)"
+    echo "Enter size of your RAM (in MB): (defaults to 2 for Archos, 32 for iPod Video)"
     size=`input`;
   fi
 
-  case $size in
-   8)
-    memory="8"
-    ;;
+  case $target_id in
+   15)
+     	case $size in
+     	64)
+	      memory="64"
+  	  	;;
+  	  *)
+      	memory="32"
+	     	;;
+			esac
+			;;	
    *)
-    memory="2"
-    ;;
-
-  esac
+     	case $size in
+	   	8)
+  	  	memory="8"
+    		;;
+   		*)
+    		memory="2"
+    		;;
+			esac
+			;;	
+   esac
   echo "Memory size selected: $memory MB"
 fi
 
