5 files changed, 33 insertions, 2 deletions

diff --git a/tools/builds.pm b/tools/builds.pm
index 1dfe937426..e002bfca7b 100644
--- a/tools/builds.pm
+++ b/tools/builds.pm
@@ -418,6 +418,10 @@ $releasenotes="/wiki/ReleaseNotes314";
         name => 'Agptek Rocker',
         status => 2
     }
+    'xduoox3' => {
+        name => 'xDuoo X3',
+        status => 2,
+    },
 );
 
 sub manualname {
diff --git a/tools/configure b/tools/configure
index 76a62a6364..330c6640fe 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1535,6 +1535,8 @@ cat <<EOF
  232) DX50                240) Rocker            227) NW-A20 series
  233) DX90                                       228) NWZ-A860 series
                                                  229) NWZ-S750 series
+ ==xDuoo==
+ 241) X3
 EOF
 
   buildfor=`input`;
@@ -4215,6 +4217,28 @@ fi
     mipsellinuxcc
     ;;
 
+    241|xduoox3)
+    target_id=106
+    modelname="xduoox3"
+    target="XDUOO_X3"
+    memory=64
+    mipselcc
+    tool="$rootdir/tools/scramble -add=xdx3"
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$bmp2rb_mono"
+    output="rockbox.x3"
+    appextra="recorder:gui:radio"
+    plugins="yes"
+    swcodec="yes"
+    toolset=$genericbitmaptools
+    boottool="cp"
+    bootoutput="bootloader-x3.bin"
+    # architecture, manufacturer and model for the target-tree build
+    t_cpu="mips"
+    t_manufacturer="ingenic_jz47xx"
+    t_model="xduoo_x3"
+    ;;
+
    *)
     echo "Please select a supported target platform!"
     exit 7
diff --git a/tools/release/sims.pl b/tools/release/sims.pl
index d5cef51c67..190516907e 100755
--- a/tools/release/sims.pl
+++ b/tools/release/sims.pl
@@ -225,3 +225,4 @@ runone("sonynwze370");
 runone("creativezenxfi");
 runone("creativezen");
 runone("creativezenmozaic");
+runone("xduoox3");
diff --git a/tools/rockboxdev.sh b/tools/rockboxdev.sh
index 856ab2003d..fac56e1102 100755
--- a/tools/rockboxdev.sh
+++ b/tools/rockboxdev.sh
@@ -700,7 +700,7 @@ if [ -z "$RBDEV_TARGET" ]; then
     echo "s   - sh       (Archos models)"
     echo "m   - m68k     (iriver h1x0/h3x0, iaudio m3/m5/x5 and mpio hd200)"
     echo "a   - arm      (ipods, iriver H10, Sansa, D2, Gigabeat, etc)"
-    echo "i   - mips     (Jz4740 and ATJ-based players)"
+    echo "i   - mips     (Jz47xx and ATJ-based players)"
     echo "r   - arm-app  (Samsung ypr0)"
     echo "x   - arm-linux  (Generic Linux ARM: Samsung ypr0, Linux-based Sony NWZ)"
     echo "y   - mips-linux  (Generic Linux MIPS: AGPTek Rocker)"
diff --git a/tools/scramble.c b/tools/scramble.c
index 14be30de69..7aa468ebaa 100644
--- a/tools/scramble.c
+++ b/tools/scramble.c
@@ -130,7 +130,7 @@ void usage(void)
            "\t                   747p, x777, nn2g, m244, cli+, fuz2, hd20, hd30,\n"
            "\t                   ip6g, rk27, clzp, zxf2, zxf3, fuz+, e370, e360,\n"
            "\t                   zxfi, zmoz, zen, zenv, ypz5, zxfs, e450, e460,\n"
-           "\t                   e470,e580,a10,a20,a860,s750,e350)\n");
+           "\t                   e470, e580, a10, a20, a860, s750, e350, xdx3)\n");
     printf("\nNo option results in Archos standard player/recorder format.\n");
 
     exit(1);
@@ -383,6 +383,8 @@ int main (int argc, char** argv)
             modelnum = 90;
         else if (!strcmp(&argv[1][5], "zxfs")) /* Creative ZEN X-Fi Style */
             modelnum = 94;
+        else if (!strcmp(&argv[1][5], "xdx3")) /* xDuoo X3 */
+            modelnum = 96;
         else if (!strcmp(&argv[1][5], "e450")) /* Sony NWZ-E450 series */
             modelnum = 100;
         else if (!strcmp(&argv[1][5], "e460")) /* Sony NWZ-E460 series */