2 files changed, 25 insertions, 3 deletions

diff --git a/tools/configure b/tools/configure
index 6ffd640398..9a919b3286 100755
--- a/tools/configure
+++ b/tools/configure
@@ -455,7 +455,8 @@ toolsdir='\$(ROOTDIR)/tools'
   echo "15 - iPod Video"
   echo "16 - iPod 3G"
   echo "17 - iPod 4G (Grayscale)"
-  echo "18 - iriver iFP-790"
+  echo "18 - iPod Mini (1G/2G)"
+  echo "19 - iriver iFP-790"
 
   target_id=`input`;
 
@@ -799,6 +800,25 @@ toolsdir='\$(ROOTDIR)/tools'
     ;;
     
    18)
+    archos="ipodmini"
+    target="-DIPOD_MINI"
+    memory=32 # always
+    arm7tdmicc
+    tool="$rootdir/tools/scramble -add=mini"
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 6"
+    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
+    ;;
+    
+   19)
     archos="ifp7xx"
     target="-DIRIVER_IFP7XX"
     memory=1
@@ -872,7 +892,7 @@ fi
   case $option in
     [Bb])
       case $archos in
-          h100|h120|h300|x5|ipodcolor|ipodnano|ipodvideo|ipod3g|ipod4g)
+          h100|h120|h300|x5|ipodcolor|ipodnano|ipodvideo|ipod3g|ipod4g|ipodmini)
               extradefines="-DBOOTLOADER" # for target makefile symbol EXTRA_DEFINES
               appsdir='\$(ROOTDIR)/bootloader'
               apps="bootloader"
diff --git a/tools/scramble.c b/tools/scramble.c
index ee5df56dc7..642080e699 100644
--- a/tools/scramble.c
+++ b/tools/scramble.c
@@ -72,7 +72,7 @@ void usage(void)
            "\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                   ip3g, ip4g)\n"
+           "\t                   ip3g, ip4g, mini)\n"
            "\nNo option results in Archos standard player/recorder format.\n");
 
     exit(1);
@@ -178,6 +178,8 @@ int main (int argc, char** argv)
             modelnum = 7;
         else if(!strcmp(&argv[1][5], "ip4g"))
             modelnum = 8;
+        else if(!strcmp(&argv[1][5], "mini"))
+            modelnum = 9;
         else {
             fprintf(stderr, "unsupported model: %s\n", &argv[1][5]);
             return 2;