diff options
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/configure | 44 | ||||
-rw-r--r-- | tools/scramble.c | 7 |
2 files changed, 48 insertions, 3 deletions
diff --git a/tools/configure b/tools/configure index 194575ad8d..910b59ecf0 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -447,7 +447,9 @@ appsdir='\$(ROOTDIR)/apps' | |||
447 | echo "13 - iPod Color/Photo" | 447 | echo "13 - iPod Color/Photo" |
448 | echo "14 - iPod Nano" | 448 | echo "14 - iPod Nano" |
449 | echo "15 - iPod Video" | 449 | echo "15 - iPod Video" |
450 | echo "16 - iriver iFP-790" | 450 | echo "16 - iPod 3G" |
451 | echo "17 - iPod 4G (Grayscale)" | ||
452 | echo "18 - iriver iFP-790" | ||
451 | 453 | ||
452 | target_id=`input`; | 454 | target_id=`input`; |
453 | 455 | ||
@@ -753,6 +755,44 @@ appsdir='\$(ROOTDIR)/apps' | |||
753 | ;; | 755 | ;; |
754 | 756 | ||
755 | 16) | 757 | 16) |
758 | archos="ipod3g" | ||
759 | target="-DIPOD_3G" | ||
760 | memory=32 # always | ||
761 | arm7tdmicc | ||
762 | tool="$rootdir/tools/scramble -add=ip3g" | ||
763 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" | ||
764 | bmp2rb_native="$rootdir/tools/bmp2rb -f 2" | ||
765 | output="rockbox.ipod" | ||
766 | appextra="recorder:gui" | ||
767 | archosrom="" | ||
768 | flash="" | ||
769 | plugins="yes" | ||
770 | codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a" | ||
771 | # toolset is the tools within the tools directory that we build for | ||
772 | # this particular target. | ||
773 | toolset=$ipodbitmaptools | ||
774 | ;; | ||
775 | |||
776 | 17) | ||
777 | archos="ipod4g" | ||
778 | target="-DIPOD_4G" | ||
779 | memory=32 # always | ||
780 | arm7tdmicc | ||
781 | tool="$rootdir/tools/scramble -add=ip4g" | ||
782 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" | ||
783 | bmp2rb_native="$rootdir/tools/bmp2rb -f 2" | ||
784 | output="rockbox.ipod" | ||
785 | appextra="recorder:gui" | ||
786 | archosrom="" | ||
787 | flash="" | ||
788 | plugins="yes" | ||
789 | codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a" | ||
790 | # toolset is the tools within the tools directory that we build for | ||
791 | # this particular target. | ||
792 | toolset=$ipodbitmaptools | ||
793 | ;; | ||
794 | |||
795 | 18) | ||
756 | archos="ifp7xx" | 796 | archos="ifp7xx" |
757 | target="-DIRIVER_IFP7XX" | 797 | target="-DIRIVER_IFP7XX" |
758 | memory=1 | 798 | memory=1 |
@@ -815,7 +855,7 @@ fi | |||
815 | case $option in | 855 | case $option in |
816 | [Bb]) | 856 | [Bb]) |
817 | case $archos in | 857 | case $archos in |
818 | h100|h120|h300|x5|ipodcolor|ipodnano|ipodvideo) | 858 | h100|h120|h300|x5|ipodcolor|ipodnano|ipodvideo|ipod3g|ipod4g) |
819 | extradefines="-DBOOTLOADER" # for target makefile symbol EXTRA_DEFINES | 859 | extradefines="-DBOOTLOADER" # for target makefile symbol EXTRA_DEFINES |
820 | appsdir='\$(ROOTDIR)/bootloader' | 860 | appsdir='\$(ROOTDIR)/bootloader' |
821 | apps="bootloader" | 861 | apps="bootloader" |
diff --git a/tools/scramble.c b/tools/scramble.c index 44a1902424..ee5df56dc7 100644 --- a/tools/scramble.c +++ b/tools/scramble.c | |||
@@ -71,7 +71,8 @@ void usage(void) | |||
71 | "\t-iriver iRiver format\n" | 71 | "\t-iriver iRiver format\n" |
72 | "\t-iaudio iAudio format\n" | 72 | "\t-iaudio iAudio format\n" |
73 | "\t-add=X Rockbox generic \"add-up\" checksum format\n" | 73 | "\t-add=X Rockbox generic \"add-up\" checksum format\n" |
74 | "\t (X values: h100, h120, h140, h300, ipco, nano, ipvd)\n" | 74 | "\t (X values: h100, h120, h140, h300, ipco, nano, ipvd\n" |
75 | "\t ip3g, ip4g)\n" | ||
75 | "\nNo option results in Archos standard player/recorder format.\n"); | 76 | "\nNo option results in Archos standard player/recorder format.\n"); |
76 | 77 | ||
77 | exit(1); | 78 | exit(1); |
@@ -173,6 +174,10 @@ int main (int argc, char** argv) | |||
173 | modelnum = 5; | 174 | modelnum = 5; |
174 | else if(!strcmp(&argv[1][5], "fp7x")) | 175 | else if(!strcmp(&argv[1][5], "fp7x")) |
175 | modelnum = 6; | 176 | modelnum = 6; |
177 | else if(!strcmp(&argv[1][5], "ip3g")) | ||
178 | modelnum = 7; | ||
179 | else if(!strcmp(&argv[1][5], "ip4g")) | ||
180 | modelnum = 8; | ||
176 | else { | 181 | else { |
177 | fprintf(stderr, "unsupported model: %s\n", &argv[1][5]); | 182 | fprintf(stderr, "unsupported model: %s\n", &argv[1][5]); |
178 | return 2; | 183 | return 2; |