2 files changed, 2 insertions, 23 deletions

diff --git a/tools/configure b/tools/configure
index eb3a971366..91e7bb27be 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1571,7 +1571,7 @@ cat <<EOF
  141) YH-920                                     63) Sansa Fuze v2
  142) YH-925              ==Tatung==             64) Sansa Fuze+
  143) YP-S3               150) Elio TPJ-1022     65) Sansa Clip Zip
- 144) YP-Z5                                      66) Sansa Connect
+                                                 66) Sansa Connect
                           ==Packard Bell==
  ==Application==          160) Vibe 500
  200) SDL
@@ -3085,25 +3085,6 @@ 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=""
-    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 ec79cb8ca2..fbefb60eec 100644
--- a/tools/scramble.c
+++ b/tools/scramble.c
@@ -106,7 +106,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, ypz5, zxfs, e450, e460,\n"
+           "\t                   zxfi, zmoz, zen, zenv, zxfs, e450, e460,\n"
            "\t                   e470, e580, a10, a20, a860, s750, e350, xdx3)\n");
     printf("\nNo option results in nothing being done.\n");
 
@@ -295,8 +295,6 @@ 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 */