2 files changed, 31 insertions, 0 deletions

diff --git a/tools/configure b/tools/configure
index 697abceb00..b4c2fd8b21 100755
--- a/tools/configure
+++ b/tools/configure
@@ -442,6 +442,9 @@ cat <<EOF
 
  ==iAudio==            ==Toshiba==            ==SanDisk==      
  30) X5/X5V/X5L        40) Gigabeat F         50) Sansa e200   
+
+ ==Tatung==
+ 60) Elio TPJ-1022
 EOF
 
   buildfor=`input`;
@@ -1018,6 +1021,32 @@ EOF
     t_model="h10"
     ;;
 
+   60|tpj1022)
+    target_id=23
+    archos="tpj1022"
+    target="-DELIO_TPJ1022"
+    memory=32 # always
+    arm7tdmicc
+    tool="$rootdir/tools/scramble -add tpj2"
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 5"
+    output="rockbox.elio"
+    appextra="recorder:gui"
+    archosrom=""
+    flash=""
+    plugins="yes"
+    codecs="libmad liba52 libffmpegFLAC libTremor libwavpack dumb libmusepack libalac libfaad libm4a"
+    boottool="$rootdir/tools/scramble -mi4v2"
+    bootoutput="pp5020.mi4"
+    # toolset is the tools within the tools directory that we build for
+    # this particular target.
+    toolset="$genericbitmaptools scramble"
+    # architecture, manufacturer and model for the target-tree build
+    t_cpu="arm"
+    t_manufacturer="tatung"
+    t_model="tpj1022"
+    ;;
+
    *)
     echo "Please select a supported target platform!"
     exit
diff --git a/tools/scramble.c b/tools/scramble.c
index 50d745b388..30d4ea9edb 100644
--- a/tools/scramble.c
+++ b/tools/scramble.c
@@ -205,6 +205,8 @@ int main (int argc, char** argv)
             modelnum = 13;
         else if(!strcmp(&argv[1][5], "h10_5gb"))
             modelnum = 14;
+        else if(!strcmp(&argv[1][5], "tpj2"))
+            modelnum = 15;
         else {
             fprintf(stderr, "unsupported model: %s\n", &argv[1][5]);
             return 2;