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'
   echo "13 - iPod Color/Photo"
   echo "14 - iPod Nano"
   echo "15 - iPod Video"
-  echo "16 - iriver iFP-790"
+  echo "16 - iPod 3G"
+  echo "17 - iPod 4G (Grayscale)"
+  echo "18 - iriver iFP-790"
 
   target_id=`input`;
 
@@ -753,6 +755,44 @@ appsdir='\$(ROOTDIR)/apps'
     ;;
 
    16)
+    archos="ipod3g"
+    target="-DIPOD_3G"
+    memory=32 # always
+    arm7tdmicc
+    tool="$rootdir/tools/scramble -add=ip3g"
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 2"
+    output="rockbox.ipod"
+    appextra="recorder:gui"
+    archosrom=""
+    flash=""
+    plugins="yes"
+    codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+    # toolset is the tools within the tools directory that we build for
+    # this particular target.
+    toolset=$ipodbitmaptools
+    ;;
+    
+   17)
+    archos="ipod4g"
+    target="-DIPOD_4G"
+    memory=32 # always
+    arm7tdmicc
+    tool="$rootdir/tools/scramble -add=ip4g"
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 2"
+    output="rockbox.ipod"
+    appextra="recorder:gui"
+    archosrom=""
+    flash=""
+    plugins="yes"
+    codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+    # toolset is the tools within the tools directory that we build for
+    # this particular target.
+    toolset=$ipodbitmaptools
+    ;;
+    
+   18)
     archos="ifp7xx"
     target="-DIRIVER_IFP7XX"
     memory=1
@@ -815,7 +855,7 @@ fi
   case $option in
     [Bb])
       case $archos in
-          h100|h120|h300|x5|ipodcolor|ipodnano|ipodvideo)
+          h100|h120|h300|x5|ipodcolor|ipodnano|ipodvideo|ipod3g|ipod4g)
               extradefines="-DBOOTLOADER" # for target makefile symbol EXTRA_DEFINES
               appsdir='\$(ROOTDIR)/bootloader'
               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)
            "\t-iriver iRiver format\n"
            "\t-iaudio iAudio format\n"
            "\t-add=X  Rockbox generic \"add-up\" checksum format\n"
-           "\t        (X values: h100, h120, h140, h300, ipco, nano, ipvd)\n"
+           "\t        (X values: h100, h120, h140, h300, ipco, nano, ipvd\n"
+           "\t                   ip3g, ip4g)\n"
            "\nNo option results in Archos standard player/recorder format.\n");
 
     exit(1);
@@ -173,6 +174,10 @@ int main (int argc, char** argv)
             modelnum = 5;
         else if(!strcmp(&argv[1][5], "fp7x"))
             modelnum = 6;
+        else if(!strcmp(&argv[1][5], "ip3g"))
+            modelnum = 7;
+        else if(!strcmp(&argv[1][5], "ip4g"))
+            modelnum = 8;
         else {
             fprintf(stderr, "unsupported model: %s\n", &argv[1][5]);
             return 2;