2 files changed, 35 insertions, 9 deletions

diff --git a/tools/configure b/tools/configure
index dbbc4252d8..dee6bbfe09 100755
--- a/tools/configure
+++ b/tools/configure
@@ -894,12 +894,12 @@ cat <<EOF
  90) Zen Vision:M 30GB    100) GoGear SA9200     55) Sansa Clip
  91) Zen Vision:M 60GB    101) GoGear HDD1630/   56) Sansa e200v2
  92) Zen Vision                HDD1830           57) Sansa m200v4
-                                                 58) Sansa Fuze
- ==Onda==                 ==Meizu==              59) Sansa c200v2
- 120) VX747               110) M6SL              60) Sansa Clipv2
- 121) VX767               111) M6SP              61) Sansa View
- 122) VX747+              112) M3
- 123) VX777                                      ==Logik==
+                          102) GoGear HDD6330    58) Sansa Fuze
+ ==Onda==                                        59) Sansa c200v2
+ 120) VX747               ==Meizu==              60) Sansa Clipv2
+ 121) VX767               110) M6SL              61) Sansa View
+ 122) VX747+              111) M6SP
+ 123) VX777               112) M3                ==Logik==
                                                  80) DAX 1GB MP3/DAB
  ==Samsung==              ==Tatung==
  140) YH-820              150) Elio TPJ-1022     ==Lyre project==
@@ -2120,6 +2120,30 @@ fi
     t_model="hdd1630"
     ;;
 
+   102|gogearhdd6330)
+    target_id=65
+    modelname="gogearhdd6330"
+    target="-DPHILIPS_HDD6330"
+    memory=32 # supposedly
+    arm7tdmicc
+    tool="$rootdir/tools/scramble -mi4v3 -model=6330 -type=RBOS"
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
+    output="rockbox.mi4"
+    appextra="recorder:gui"
+    plugins=""
+    swcodec="yes"
+    boottool="$rootdir/tools/scramble -mi4v3 -model=6330 -type=RBBL"
+    bootoutput="FWImage.ebn"
+    # toolset is the tools within the tools directory that we build for
+    # this particular target.
+    toolset=$scramblebitmaptools
+    # architecture, manufacturer and model for the target-tree build
+    t_cpu="arm"
+    t_manufacturer="philips"
+    t_model="hdd6330"
+    ;;
+
    110|meizum6sl)
     target_id=49
     modelname="meizum6sl"
diff --git a/tools/scramble.c b/tools/scramble.c
index c9b6d15dd4..9bfdbda905 100644
--- a/tools/scramble.c
+++ b/tools/scramble.c
@@ -123,9 +123,9 @@ void usage(void)
            "\t        (X values: h100, h120, h140, h300, ipco, nano, ipvd, mn2g\n"
            "\t                   ip3g, ip4g, mini, iax5, iam5, iam3, h10, h10_5gb,\n"
            "\t                   tpj2, c200, e200, giga, gigs, m100, m500, d2,\n");
-    printf("\t                   9200, 1630, ldax, m200, c100, clip, e2v2, m2v4,\n"
-           "\t                   fuze, c2v2, clv2, y820, y920, y925, x747, 747p, \n"
-           "\t                   x777, nn2g, m244)\n");
+    printf("\t                   9200, 1630, 6330, ldax, m200, c100, clip, e2v2,\n"
+           "\t                   m2v4, fuze, c2v2, clv2, y820, y920, y925, x747,\n"
+           "\t                   747p, x777, nn2g, m244)\n");
     printf("\nNo option results in Archos standard player/recorder format.\n");
 
     exit(1);
@@ -318,6 +318,8 @@ int main (int argc, char** argv)
             modelnum = 62;
         else if (!strcmp(&argv[1][5], "x767"))
             modelnum = 64;
+        else if (!strcmp(&argv[1][5], "6330")) /* Philips HDD6330 */
+            modelnum = 65;
         else if (!strcmp(&argv[1][5], "m244"))
             modelnum = 131;
         else {