nwztools/upgtools: misc fixes

* added KAS for nwz-x1000 (extracted from an NWZ-X1060 via "get_dnk_nvp kas")

* hint that -o is needed when extracting

Change-Id: Ic91c448aa058a22c8ddcae54726f628f7cf60f6b

2 files changed, 6 insertions, 0 deletions

diff --git a/utils/nwztools/upgtools/upg.c b/utils/nwztools/upgtools/upg.c
index 051ee4c15a..b3b80ac771 100644
--- a/utils/nwztools/upgtools/upg.c
+++ b/utils/nwztools/upgtools/upg.c
@@ -36,6 +36,7 @@ struct nwz_model_t g_model_list[] =
     { "nwz-e470", true, "e4144baaa2707913f17b5634034262c4" },
     { "nwz-e580", true, "6e25f79812eca7ceed04819d833e80af" },
     { "nwz-s750", true, "6d4f4d9adec781baf197e6255cedd0f6" },
+    { "nwz-x1000",true, "efafdee4c628fa7536de0b878cfe23af" },
     { "nw-zx100", true, "cdda8d5e5360fd4373154388743f84d2" },
     /* The following keys were obtained by brute forcing firmware upgrades,
      * someone with a device needs to confirm that they work */
diff --git a/utils/nwztools/upgtools/upgtool.c b/utils/nwztools/upgtools/upgtool.c
index a1dce84870..7a4d78f0d7 100644
--- a/utils/nwztools/upgtools/upgtool.c
+++ b/utils/nwztools/upgtools/upgtool.c
@@ -465,6 +465,11 @@ int main(int argc, char **argv)
         printf("You cannot specify both create and extract\n");
         return 1;
     }
+    if(extract && !g_out_prefix)
+    {
+        printf("You need to  specify output prefix (-o) to extract\n");
+        return 1;
+    }
 
     int ret = 0;
     if(create)