2 files changed, 24 insertions, 1 deletions

diff --git a/tools/configure b/tools/configure
index 71bd8d6029..b33c798a3a 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1325,6 +1325,7 @@ cat <<EOF
  141) YH-920              170) HD200             ==Lyre project==
  142) YH-925              171) HD300             130) Lyre proto 1
  143) YP-S3                                      131) Mini2440
+ 144) YP-Z5
                           ==ROCKCHIP==
  ==Application==          180) rk27xx generic    ==HiFiMAN==
  200) SDL                                        190) HM-60x
@@ -3142,6 +3143,26 @@ fi
     t_model="yps3"
     ;;
     
+  144|samsungypz5)
+    target_id=90
+    modelname="samsungypz5"
+    target="SAMSUNG_YPZ5"
+    memory=16
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
+    tool="$rootdir/tools/scramble -add=ypz5"
+    output="rockbox.samsung"
+    bootoutput="bootloader-ypz5.samsung"
+    appextra="gui:recorder:radio"
+    plugins=""
+    swcodec="yes"
+    toolset=$scramblebitmaptools
+    t_cpu="arm"
+    t_manufacturer="imx233"
+    t_model="samsung-ypz5"
+    arm926ejscc
+    ;;
+
    160|vibe500)
     target_id=67
     modelname="vibe500"
diff --git a/tools/scramble.c b/tools/scramble.c
index ef7c41befb..ba335d2f2d 100644
--- a/tools/scramble.c
+++ b/tools/scramble.c
@@ -129,7 +129,7 @@ void usage(void)
            "\t                   m2v4, fuze, c2v2, clv2, y820, y920, y925, x747,\n"
            "\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)\n");
+           "\t                   zxfi, zmoz, zen, zenv, ypz5)\n");
     printf("\nNo option results in Archos standard player/recorder format.\n");
 
     exit(1);
@@ -366,6 +366,8 @@ int main (int argc, char** argv)
             modelnum = 82;
         else if (!strcmp(&argv[1][5], "zxf3")) /* Creative Zen X-Fi3 */
             modelnum = 83;
+        else if (!strcmp(&argv[1][5], "ypz5")) /* Samsung YP-Z5 */
+            modelnum = 84;
         else if (!strcmp(&argv[1][5], "zenv")) /* Creative Zen V */
             modelnum = 85;
         else if (!strcmp(&argv[1][5], "zxfi")) /* Creative ZEN X-Fi */