nwztools: add A35 model and KAS

We don't know the encryption method, the KAS is completely different but it
might be useful to record it anyway for future purposes. MID extracted from
device, Japanese NW-A35.

Change-Id: I4c4bb5b063da99003b5c316061d8c490b77428a4

5 files changed, 9 insertions, 4 deletions

diff --git a/utils/nwztools/database/models.txt b/utils/nwztools/database/models.txt
index a8ac46bfc2..447b043bb1 100644
--- a/utils/nwztools/database/models.txt
+++ b/utils/nwztools/database/models.txt
@@ -181,3 +181,4 @@
 0x1d000007,NW-A28
 0x20000007,NW-WM1A
 0x21000008,NW-WM1Z
+0x22000004,NW-A35
diff --git a/utils/nwztools/database/nwz_db.c b/utils/nwztools/database/nwz_db.c
index 9e45988189..1c93739e22 100644
--- a/utils/nwztools/database/nwz_db.c
+++ b/utils/nwztools/database/nwz_db.c
@@ -207,6 +207,7 @@ struct nwz_model_info_t nwz_model[NWZ_MODEL_COUNT] =
     { 0x1d000007, "NW-A28" },
     { 0x20000007, "NW-WM1A" },
     { 0x21000008, "NW-WM1Z" },
+    { 0x22000004, "NW-A35" },
 };
 
 static int nvp_index_0ac81d[NWZ_NVP_COUNT] =
@@ -1014,7 +1015,7 @@ static unsigned long models_nwz_a10[] = { 0x1a000001, 0x1a000002, 0x1a000004,
 static unsigned long models_nw_a20[] = { 0x1d000001, 0x1d000002, 0x1d000004,
     0x1d000005, 0x1d000006, 0x1d000007 };
 
-static unsigned long models_nw_a30[] = {  };
+static unsigned long models_nw_a30[] = { 0x22000004 };
 
 static unsigned long models_nwz_a720[] = { 0x3030001, 0x3030002, 0x3030004,
     0x3020001, 0x3020002, 0x3020004 };
@@ -1111,7 +1112,7 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] =
 {
     { "nwz-a10", "NWZ-A10 Series", 10, models_nwz_a10, &nvp_index_92faee },
     { "nw-a20", "NW-A20 Series", 6, models_nw_a20, &nvp_index_92faee },
-    { "nw-a30", "NW-A30 Series", 0, models_nw_a30, &nvp_index_398250 },
+    { "nw-a30", "NW-A30 Series", 1, models_nw_a30, &nvp_index_398250 },
     { "nwz-a720", "NWZ-A720 Series", 6, models_nwz_a720, 0 },
     { "nwz-a810", "NWZ-A810 Series", 3, models_nwz_a810, 0 },
     { "nwz-a820", "NWZ-A820 Series", 6, models_nwz_a820, 0 },
diff --git a/utils/nwztools/database/nwz_db.h b/utils/nwztools/database/nwz_db.h
index 6fb742ca2a..23b83c5383 100644
--- a/utils/nwztools/database/nwz_db.h
+++ b/utils/nwztools/database/nwz_db.h
@@ -141,7 +141,7 @@ enum nwz_nvp_node_t
 /* Invalid NVP index */
 #define NWZ_NVP_INVALID     -1 /* Non-existent entry */
 /* Number of models */
-#define NWZ_MODEL_COUNT     183
+#define NWZ_MODEL_COUNT     184
 /* Number of series */
 #define NWZ_SERIES_COUNT    36
 
diff --git a/utils/nwztools/database/series.txt b/utils/nwztools/database/series.txt
index dff2cca4d0..8c1bdb86ed 100644
--- a/utils/nwztools/database/series.txt
+++ b/utils/nwztools/database/series.txt
@@ -1,6 +1,6 @@
 nwz-a10,NWZ-A10 Series,0x1a000001,0x1a000002,0x1a000004,0x1a000005,0x1a000006,0x1a010001,0x1a010002,0x1a010004,0x1a010005,0x1a010006
 nw-a20,NW-A20 Series,0x1d000001,0x1d000002,0x1d000004,0x1d000005,0x1d000006,0x1d000007
-nw-a30,NW-A30 Series,
+nw-a30,NW-A30 Series,0x22000004
 nwz-a720,NWZ-A720 Series,0x3030001,0x3030002,0x3030004,0x3020001,0x3020002,0x3020004
 nwz-a810,NWZ-A810 Series,0x10000,0x10001,0x10002
 nwz-a820,NWZ-A820 Series,0x3010001,0x3010002,0x3010004,0x3000001,0x3000002,0x3000004
diff --git a/utils/nwztools/upgtools/upg.c b/utils/nwztools/upgtools/upg.c
index a792669c55..2154dddb5b 100644
--- a/utils/nwztools/upgtools/upg.c
+++ b/utils/nwztools/upgtools/upg.c
@@ -38,6 +38,9 @@ struct nwz_model_t g_model_list[] =
     { "nw-a820", false, "0c9869c268e0eaa6d1ba62daab09cebc" },
     { "nw-a20", false, "e9d7185e5ac183bf26e9a5b66f983c0b" },
     { "nwz-zx100", false, "2c0bf029804f73e073154388743f84d2" },
+    /* The following models use a different encryption, but we put the KAS here
+     * to not forget them */
+    { "nw-a30", false, "c40d91e7efff3e3aa5c8831dd85526fe4972086283419c8cd8fa3b7dcd39" },
     { 0 }
 };