Add D2 option to scramble

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

3 files changed, 7 insertions, 12 deletions

diff --git a/firmware/export/config-cowond2.h b/firmware/export/config-cowond2.h
index 4f2d11e424..cbe96f8a92 100644
--- a/firmware/export/config-cowond2.h
+++ b/firmware/export/config-cowond2.h
@@ -4,7 +4,7 @@
 #define TARGET_TREE /* this target is using the target tree system */
 
 /* For Rolo and boot loader */
-#define MODEL_NUMBER 34
+#define MODEL_NUMBER 24
 
 /* define this if you have recording possibility */
 //#define HAVE_RECORDING
@@ -115,18 +115,11 @@
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
-/* Offset ( in the firmware file's header ) to the file length */
-#define FIRMWARE_OFFSET_FILE_LENGTH 0
-
 /* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 4
+#define FIRMWARE_OFFSET_FILE_CRC 0
 
 /* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 6
-
-/* The start address index for ROM builds */
-/* #define ROM_START 0x11010 for behind original Archos */
-#define ROM_START 0x7010 /* for behind BootBox */
+#define FIRMWARE_OFFSET_FILE_DATA 8
 
 /* Software controlled LED */
 #define CONFIG_LED LED_VIRTUAL
diff --git a/tools/configure b/tools/configure
index d2b0bfc626..917e963e97 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1481,7 +1481,7 @@ EOF
     target="-DCOWON_D2"
     memory=32
     arm926ejscc
-    tool="cp "
+    tool="$rootdir/tools/scramble -add=d2"
     boottool="$rootdir/tools/scramble -tcc=crc"
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
diff --git a/tools/scramble.c b/tools/scramble.c
index 6d69f9175e..ee731cfd0d 100644
--- a/tools/scramble.c
+++ b/tools/scramble.c
@@ -108,7 +108,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, giga, gigs, m100, m500)\n"
+           "\t                   c200, e200, giga, gigs, m100, m500, d2)\n"
            "\nNo option results in Archos standard player/recorder format.\n");
 
     exit(1);
@@ -256,6 +256,8 @@ int main (int argc, char** argv)
             modelnum = 22;
         else if(!strcmp(&argv[1][5], "m100"))
             modelnum = 23;
+        else if(!strcmp(&argv[1][5], "d2"))
+            modelnum = 24;
         else {
             fprintf(stderr, "unsupported model: %s\n", &argv[1][5]);
             return 2;