2 files changed, 48 insertions, 3 deletions

diff --git a/tools/configure b/tools/configure
index e3a2e3d37d..4e548eea91 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1330,8 +1330,9 @@ cat <<EOF
  203) Nokia N900                                 190) HM-60x
  204) Pandora             ==HiFi E.T.==          191) HM-801
  205) Samsung YP-R0       210) MA9
- 206) Android MIPS
- 207) Android x86
+ 206) Android MIPS                               ==Sony==
+ 207) Android x86                                220) NWZ-E370 series
+                                                 221) NWZ-E360 series
 EOF
 
   buildfor=`input`;
@@ -3434,6 +3435,46 @@ fi
     t_model="ma"
     ;;
 
+   220|sonynwze370)
+    target_id=88
+    modelname="sonynwze370"
+    target="SONY_NWZE370"
+    memory=32
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
+    tool="$rootdir/tools/scramble -add=e370"
+    output="rockbox.sony"
+    bootoutput="bootloader-nwze370.sony"
+    appextra="gui:recorder:radio"
+    plugins=""
+    swcodec="yes"
+    toolset=$scramblebitmaptools
+    t_cpu="arm"
+    t_manufacturer="imx233"
+    t_model="sony-nwz"
+    arm926ejscc
+    ;;
+
+   221|sonynwze360)
+    target_id=89
+    modelname="sonynwze360"
+    target="SONY_NWZE360"
+    memory=32
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
+    tool="$rootdir/tools/scramble -add=e360"
+    output="rockbox.sony"
+    bootoutput="bootloader-nwze360.sony"
+    appextra="gui:recorder:radio"
+    plugins=""
+    swcodec="yes"
+    toolset=$scramblebitmaptools
+    t_cpu="arm"
+    t_manufacturer="imx233"
+    t_model="sony-nwz"
+    arm926ejscc
+    ;;
+
    *)
     echo "Please select a supported target platform!"
     exit 7
diff --git a/tools/scramble.c b/tools/scramble.c
index e948026f76..7b164e0899 100644
--- a/tools/scramble.c
+++ b/tools/scramble.c
@@ -128,7 +128,7 @@ void usage(void)
            "\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, cli+, fuz2, hd20, hd30,\n"
-           "\t                   ip6g, rk27, clzp, zxf2, zxf3, fuz+)\n");
+           "\t                   ip6g, rk27, clzp, zxf2, zxf3, fuz+, e370, e360)\n");
     printf("\nNo option results in Archos standard player/recorder format.\n");
 
     exit(1);
@@ -365,6 +365,10 @@ 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], "e370")) /* Sony NWZ-E370 series */
+            modelnum = 88;
+        else if (!strcmp(&argv[1][5], "e360")) /* Sony NWZ-E360 series */
+            modelnum = 89;
         else {
             fprintf(stderr, "unsupported model: %s\n", &argv[1][5]);
             return 2;