diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2008-05-14 13:51:47 +0000 |
---|---|---|
committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2008-05-14 13:51:47 +0000 |
commit | 727a8059d7f4d04fb938f14a564ea954256ef72d (patch) | |
tree | fc993f250c6e852bfcac00315a7acb5dafb068af | |
parent | 111c9997562cca155ec8974ec4afec8b5f2304a6 (diff) | |
download | rockbox-727a8059d7f4d04fb938f14a564ea954256ef72d.tar.gz rockbox-727a8059d7f4d04fb938f14a564ea954256ef72d.zip |
1) Split ZVM into 30GB and 60GB
2) Clean up config
3) Add scramble description
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17502 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/export/config-creativezvm.h | 22 | ||||
-rwxr-xr-x | tools/configure | 31 | ||||
-rw-r--r-- | tools/scramble.c | 4 |
3 files changed, 45 insertions, 12 deletions
diff --git a/firmware/export/config-creativezvm.h b/firmware/export/config-creativezvm.h index 740997a991..33a5105df7 100644 --- a/firmware/export/config-creativezvm.h +++ b/firmware/export/config-creativezvm.h | |||
@@ -56,8 +56,13 @@ | |||
56 | /* choose the lcd orientation. both work */ | 56 | /* choose the lcd orientation. both work */ |
57 | #define CONFIG_ORIENTATION SCREEN_PORTRAIT | 57 | #define CONFIG_ORIENTATION SCREEN_PORTRAIT |
58 | 58 | ||
59 | #ifdef ZEN_VISION | ||
60 | #define LCD_WIDTH 640 | ||
61 | #define LCD_HEIGHT 480 | ||
62 | #else | ||
59 | #define LCD_WIDTH 320 | 63 | #define LCD_WIDTH 320 |
60 | #define LCD_HEIGHT 240 | 64 | #define LCD_HEIGHT 240 |
65 | #endif | ||
61 | 66 | ||
62 | #define LCD_DEPTH 16 /* 65k colours */ | 67 | #define LCD_DEPTH 16 /* 65k colours */ |
63 | #define LCD_PIXELFORMAT RGB565 /* rgb565 */ | 68 | #define LCD_PIXELFORMAT RGB565 /* rgb565 */ |
@@ -105,7 +110,7 @@ | |||
105 | #define CONFIG_I2C I2C_DM320 | 110 | #define CONFIG_I2C I2C_DM320 |
106 | 111 | ||
107 | /* TLV320 has no tone controls, so we use the software ones */ | 112 | /* TLV320 has no tone controls, so we use the software ones */ |
108 | //#define HAVE_SW_TONE_CONTROLS | 113 | #define HAVE_SW_TONE_CONTROLS |
109 | 114 | ||
110 | /*#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | \ | 115 | /*#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | \ |
111 | SAMPR_CAP_11)*/ | 116 | SAMPR_CAP_11)*/ |
@@ -134,7 +139,7 @@ | |||
134 | #define CPU_FREQ 16934400 | 139 | #define CPU_FREQ 16934400 |
135 | 140 | ||
136 | /* Define this if you have ATA power-off control */ | 141 | /* Define this if you have ATA power-off control */ |
137 | //#define HAVE_ATA_POWER_OFF | 142 | #define HAVE_ATA_POWER_OFF |
138 | 143 | ||
139 | /* Virtual LED (icon) */ | 144 | /* Virtual LED (icon) */ |
140 | #define CONFIG_LED LED_VIRTUAL | 145 | #define CONFIG_LED LED_VIRTUAL |
@@ -151,10 +156,12 @@ | |||
151 | /* Define this if you have adjustable CPU frequency */ | 156 | /* Define this if you have adjustable CPU frequency */ |
152 | /* #define HAVE_ADJUSTABLE_CPU_FREQ */ | 157 | /* #define HAVE_ADJUSTABLE_CPU_FREQ */ |
153 | 158 | ||
154 | #ifndef ZEN_VISION | 159 | #ifdef ZEN_VISION |
155 | #define BOOTFILE_EXT "zvm" | 160 | #define BOOTFILE_EXT "zv" |
161 | #elseif defined(ZVM_60GB) | ||
162 | #define BOOTFILE_EXT "zvm60" | ||
156 | #else | 163 | #else |
157 | #define BOOTFILE_EXT "zv" | 164 | #define BOOTFILE_EXT "zvm" |
158 | #endif | 165 | #endif |
159 | #define BOOTFILE "rockbox." BOOTFILE_EXT | 166 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
160 | #define BOOTDIR "/.rockbox" | 167 | #define BOOTDIR "/.rockbox" |
@@ -164,13 +171,12 @@ | |||
164 | #define USB_VENDOR_ID 0x041e | 171 | #define USB_VENDOR_ID 0x041e |
165 | #define USB_PRODUCT_ID 0x4133 | 172 | #define USB_PRODUCT_ID 0x4133 |
166 | 173 | ||
167 | //DEBUGGING! | 174 | /*DEBUGGING!*/ |
168 | #ifdef BOOTLOADER | 175 | #ifdef BOOTLOADER |
169 | #define THREAD_EXTRA_CHECKS 1 | 176 | #define THREAD_EXTRA_CHECKS 1 |
170 | #define DEBUG 1 | 177 | #define DEBUG 1 |
171 | #define debug(msg) printf(msg) | 178 | #define debug(msg) printf(msg) |
172 | #define BUTTON_DEBUG | 179 | #define BUTTON_DEBUG |
173 | |||
174 | #define DO_THREAD_TEST | ||
175 | #endif | 180 | #endif |
181 | |||
176 | #endif | 182 | #endif |
diff --git a/tools/configure b/tools/configure index 2db57ef1ef..02f014d519 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -677,8 +677,9 @@ cat <<EOF | |||
677 | 60) Elio TPJ-1022 70) M:Robe 500 80) DAX 1GB MP3/DAB | 677 | 60) Elio TPJ-1022 70) M:Robe 500 80) DAX 1GB MP3/DAB |
678 | 71) M:Robe 100 | 678 | 71) M:Robe 100 |
679 | ==Creative== | 679 | ==Creative== |
680 | 90) Zen Vision:M | 680 | 90) Zen Vision:M 30GB |
681 | 91) Zen Vision | 681 | 91) Zen Vision:M 60GB |
682 | 92) Zen Vision | ||
682 | 683 | ||
683 | EOF | 684 | EOF |
684 | 685 | ||
@@ -1476,7 +1477,31 @@ fi | |||
1476 | t_model="creative-zvm" | 1477 | t_model="creative-zvm" |
1477 | ;; | 1478 | ;; |
1478 | 1479 | ||
1479 | 91|creativezenvision) | 1480 | 91|creativezvm60gb) |
1481 | target_id=40 | ||
1482 | modelname="creativezvm" | ||
1483 | target="-DCREATIVE_ZVM -DZVM_60GB" | ||
1484 | memory=64 | ||
1485 | arm926ejscc | ||
1486 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" | ||
1487 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" | ||
1488 | bmp2rb_remotemono="$rootdir/tools/bmp2rb -f 0" | ||
1489 | bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 0" | ||
1490 | tool="$rootdir/tools/scramble -creative=zvm60" | ||
1491 | output="rockbox.zvm60" | ||
1492 | appextra="recorder:gui" | ||
1493 | plugins="" | ||
1494 | swcodec="yes" | ||
1495 | toolset=$ipodbitmaptools | ||
1496 | boottool="$rootdir/tools/scramble -creative=zvm60" | ||
1497 | bootoutput="rockbox.zvm60boot" | ||
1498 | # architecture, manufacturer and model for the target-tree build | ||
1499 | t_cpu="arm" | ||
1500 | t_manufacturer="tms320dm320" | ||
1501 | t_model="creative-zvm" | ||
1502 | ;; | ||
1503 | |||
1504 | 92|creativezenvision) | ||
1480 | target_id=39 | 1505 | target_id=39 |
1481 | modelname="creativezm" | 1506 | modelname="creativezm" |
1482 | target="-DCREATIVE_ZVM -DZEN_VISION" | 1507 | target="-DCREATIVE_ZVM -DZEN_VISION" |
diff --git a/tools/scramble.c b/tools/scramble.c index 25b54be852..2dcfd0c556 100644 --- a/tools/scramble.c +++ b/tools/scramble.c | |||
@@ -104,7 +104,9 @@ void usage(void) | |||
104 | "\t-ipod4g ipod firmware partition format (4th Gen, Mini, Nano, Photo/Color)\n" | 104 | "\t-ipod4g ipod firmware partition format (4th Gen, Mini, Nano, Photo/Color)\n" |
105 | "\t-ipod5g ipod firmware partition format (5th Gen - aka Video)\n" | 105 | "\t-ipod5g ipod firmware partition format (5th Gen - aka Video)\n" |
106 | "\t-creative=X Creative firmware structure format\n" | 106 | "\t-creative=X Creative firmware structure format\n" |
107 | "\t-gigabeat Toshiba Gigabeat F/X format\n" | 107 | "\t (X values: zvm, zvm60, zenvision\n" |
108 | "\t zenv, zen\n"); | ||
109 | printf("\t-gigabeat Toshiba Gigabeat F/X format\n" | ||
108 | "\t-gigabeats Toshiba Gigabeat S format\n" | 110 | "\t-gigabeats Toshiba Gigabeat S format\n" |
109 | "\t-mi4v2 PortalPlayer .mi4 format (revision 010201)\n" | 111 | "\t-mi4v2 PortalPlayer .mi4 format (revision 010201)\n" |
110 | "\t-mi4v3 PortalPlayer .mi4 format (revision 010301)\n" | 112 | "\t-mi4v3 PortalPlayer .mi4 format (revision 010301)\n" |