diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/bmp2rb.c | 6 | ||||
-rwxr-xr-x | tools/buildzip.pl | 3 | ||||
-rwxr-xr-x | tools/configure | 75 |
3 files changed, 8 insertions, 76 deletions
diff --git a/tools/bmp2rb.c b/tools/bmp2rb.c index 478badefd7..aa23d45830 100644 --- a/tools/bmp2rb.c +++ b/tools/bmp2rb.c @@ -290,7 +290,7 @@ int transform_bitmap(const struct RGBQUAD *src, int width, int height, switch (format) { - case 0: /* Archos recorders, Ondio, Gmini 120/SP, Iriver H1x0 monochrome */ + case 0: /* Archos recorders, Ondio, Iriver H1x0 monochrome */ dst_w = width; dst_h = (height + 7) / 8; dst_d = 8; @@ -351,7 +351,7 @@ int transform_bitmap(const struct RGBQUAD *src, int width, int height, switch (format) { - case 0: /* Archos recorders, Ondio, Gmini 120/SP, Iriver H1x0 b&w */ + case 0: /* Archos recorders, Ondio, Iriver H1x0 b&w */ for (row = 0; row < height; row++) for (col = 0; col < width; col++) { @@ -528,7 +528,7 @@ void print_usage(void) "\t-h <dir> Create header file in <dir>/<id>.h\n" "\t-a Show ascii picture of bitmap\n" "\t-f <n> Generate destination format n, default = 0\n" - "\t 0 Archos recorder, Ondio, Gmini 120/SP, Iriver H1x0 mono\n" + "\t 0 Archos recorder, Ondio, Iriver H1x0 mono\n" "\t 1 Archos player graphics library\n" "\t 2 Iriver H1x0 4-grey\n" "\t 3 Canonical 8-bit greyscale\n" diff --git a/tools/buildzip.pl b/tools/buildzip.pl index e9bd9e7487..a30eb28e67 100755 --- a/tools/buildzip.pl +++ b/tools/buildzip.pl @@ -289,9 +289,6 @@ if(!$exe) { elsif($target =~ /iriver/i) { $exe = "rockbox.iriver"; } - elsif($target =~ /gmini/i) { - $exe = "rockbox.gmini"; - } else { $exe = "archos.mod"; } diff --git a/tools/configure b/tools/configure index 2b7b55fbed..06fe30d91d 100755 --- a/tools/configure +++ b/tools/configure @@ -242,28 +242,6 @@ arm9tdmicc () { endian="little" } -whichaddr () { - case $archos in - gmini120|gminisp) - echo "" - echo "Where do you want the firmware to be flashed?" - echo "WARNING: Do not answer this question lightly," - echo "unless you don't plan to flash your gmini." - echo "In this case, reply '0x10000' (no quotes) and " - echo "re-configure when you know better." - loadaddress=`input` - - if [ "0$loadaddress" = "0" ]; then - #default - loadaddress="0x10000"; - fi - echo "You selected $loadaddress" - ;; - *) - ;; - esac -} - whichdevel () { ################################################################## # Prompt for specific developer options @@ -595,10 +573,9 @@ cat <<EOF 1) Recorder 11) H320/H340 21) Nano 2) FM Recorder 12) iHP-100/110/115 22) Video 3) Recorder v2 13) iFP-790 23) 3G - 4) Gmini 120 14) H10 20Gb 24) 4G Grayscale - 5) Gmini SP 15) H10 5/6Gb 25) Mini 1G - 6) Ondio SP 26) Mini 2G - 7) Ondio FM + 4) Ondio SP 14) H10 20Gb 24) 4G Grayscale + 5) Ondio FM 15) H10 5/6Gb 25) Mini 1G + 26) Mini 2G ==iAudio== ==Toshiba== ==SanDisk== 30) X5/X5V/X5L 40) Gigabeat F 50) Sansa e200 @@ -737,47 +714,7 @@ EOF toolset=$archosbitmaptools ;; - 4|gmini120) - target_id=5 - archos="gmini120" - target="-DARCHOS_GMINI120" - memory=16 # fixed size (16 is a guess, remove comment when checked) - calmrisccc - tool="cp" # might work for now! - bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" - bmp2rb_native="$rootdir/tools/bmp2rb -f 0" - output="rockbox.gmini" - appextra="recorder:gui" - archosrom="" - flash="" - plugins="" # disabled for now, enable later on - codecs="libmad" - # toolset is the tools within the tools directory that we build for - # this particular target. - toolset="$toolset bmp2rb codepages" - ;; - - 5|gminisp) - target_id=6 - archos="gminisp" - target="-DARCHOS_GMINISP" - memory=16 # fixed size (16 is a guess, remove comment when checked) - calmrisccc - tool="cp" # might work for now! - bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" - bmp2rb_native="$rootdir/tools/bmp2rb -f 0" - output="rockbox.gmini" - appextra="recorder:gui" - archosrom="" - flash="" - plugins="" # disabled for now, enable later on - codecs="libmad" - # toolset is the tools within the tools directory that we build for - # this particular target. - toolset="$toolset bmp2rb codepages" - ;; - - 6|ondiosp) + 4|ondiosp) target_id=7 archos="ondiosp" target="-DARCHOS_ONDIOSP" @@ -796,7 +733,7 @@ EOF toolset=$archosbitmaptools ;; - 7|ondiofm) + 5|ondiofm) target_id=8 archos="ondiofm" target="-DARCHOS_ONDIOFM" @@ -1387,8 +1324,6 @@ if [ -z "$debug" ]; then GCCOPTS="$GCCOPTS $GCCOPTIMIZE" fi -whichaddr - echo "Using source code root directory: $rootdir" # this was once possible to change at build-time, but no more: |