diff options
-rw-r--r-- | firmware/export/config-cowond2.h | 13 | ||||
-rwxr-xr-x | tools/configure | 2 | ||||
-rw-r--r-- | tools/scramble.c | 4 |
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 @@ | |||
4 | #define TARGET_TREE /* this target is using the target tree system */ | 4 | #define TARGET_TREE /* this target is using the target tree system */ |
5 | 5 | ||
6 | /* For Rolo and boot loader */ | 6 | /* For Rolo and boot loader */ |
7 | #define MODEL_NUMBER 34 | 7 | #define MODEL_NUMBER 24 |
8 | 8 | ||
9 | /* define this if you have recording possibility */ | 9 | /* define this if you have recording possibility */ |
10 | //#define HAVE_RECORDING | 10 | //#define HAVE_RECORDING |
@@ -115,18 +115,11 @@ | |||
115 | /* Define this if you have adjustable CPU frequency */ | 115 | /* Define this if you have adjustable CPU frequency */ |
116 | #define HAVE_ADJUSTABLE_CPU_FREQ | 116 | #define HAVE_ADJUSTABLE_CPU_FREQ |
117 | 117 | ||
118 | /* Offset ( in the firmware file's header ) to the file length */ | ||
119 | #define FIRMWARE_OFFSET_FILE_LENGTH 0 | ||
120 | |||
121 | /* Offset ( in the firmware file's header ) to the file CRC */ | 118 | /* Offset ( in the firmware file's header ) to the file CRC */ |
122 | #define FIRMWARE_OFFSET_FILE_CRC 4 | 119 | #define FIRMWARE_OFFSET_FILE_CRC 0 |
123 | 120 | ||
124 | /* Offset ( in the firmware file's header ) to the real data */ | 121 | /* Offset ( in the firmware file's header ) to the real data */ |
125 | #define FIRMWARE_OFFSET_FILE_DATA 6 | 122 | #define FIRMWARE_OFFSET_FILE_DATA 8 |
126 | |||
127 | /* The start address index for ROM builds */ | ||
128 | /* #define ROM_START 0x11010 for behind original Archos */ | ||
129 | #define ROM_START 0x7010 /* for behind BootBox */ | ||
130 | 123 | ||
131 | /* Software controlled LED */ | 124 | /* Software controlled LED */ |
132 | #define CONFIG_LED LED_VIRTUAL | 125 | #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 | |||
1481 | target="-DCOWON_D2" | 1481 | target="-DCOWON_D2" |
1482 | memory=32 | 1482 | memory=32 |
1483 | arm926ejscc | 1483 | arm926ejscc |
1484 | tool="cp " | 1484 | tool="$rootdir/tools/scramble -add=d2" |
1485 | boottool="$rootdir/tools/scramble -tcc=crc" | 1485 | boottool="$rootdir/tools/scramble -tcc=crc" |
1486 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" | 1486 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" |
1487 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" | 1487 | 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) | |||
108 | "\t-add=X Rockbox generic \"add-up\" checksum format\n" | 108 | "\t-add=X Rockbox generic \"add-up\" checksum format\n" |
109 | "\t (X values: h100, h120, h140, h300, ipco, nano, ipvd, mn2g\n" | 109 | "\t (X values: h100, h120, h140, h300, ipco, nano, ipvd, mn2g\n" |
110 | "\t ip3g, ip4g, mini, iax5, h10, h10_5gb, tpj2,\n" | 110 | "\t ip3g, ip4g, mini, iax5, h10, h10_5gb, tpj2,\n" |
111 | "\t c200, e200, giga, gigs, m100, m500)\n" | 111 | "\t c200, e200, giga, gigs, m100, m500, d2)\n" |
112 | "\nNo option results in Archos standard player/recorder format.\n"); | 112 | "\nNo option results in Archos standard player/recorder format.\n"); |
113 | 113 | ||
114 | exit(1); | 114 | exit(1); |
@@ -256,6 +256,8 @@ int main (int argc, char** argv) | |||
256 | modelnum = 22; | 256 | modelnum = 22; |
257 | else if(!strcmp(&argv[1][5], "m100")) | 257 | else if(!strcmp(&argv[1][5], "m100")) |
258 | modelnum = 23; | 258 | modelnum = 23; |
259 | else if(!strcmp(&argv[1][5], "d2")) | ||
260 | modelnum = 24; | ||
259 | else { | 261 | else { |
260 | fprintf(stderr, "unsupported model: %s\n", &argv[1][5]); | 262 | fprintf(stderr, "unsupported model: %s\n", &argv[1][5]); |
261 | return 2; | 263 | return 2; |