summaryrefslogtreecommitdiff
path: root/utils/nwztools/database
diff options
context:
space:
mode:
Diffstat (limited to 'utils/nwztools/database')
-rw-r--r--utils/nwztools/database/nvp/nw-wm1.txt92
-rw-r--r--utils/nwztools/database/nwz_db.c353
-rw-r--r--utils/nwztools/database/nwz_db.h4
-rw-r--r--utils/nwztools/database/series.txt1
4 files changed, 273 insertions, 177 deletions
diff --git a/utils/nwztools/database/nvp/nw-wm1.txt b/utils/nwztools/database/nvp/nw-wm1.txt
new file mode 100644
index 0000000..dd058fb
--- /dev/null
+++ b/utils/nwztools/database/nvp/nw-wm1.txt
@@ -0,0 +1,92 @@
+dbg,000
+syi,001
+ubp,002
+fup,003
+prk,004
+hld,005
+rtc,006
+mid,007
+pcd,008
+ser,009
+ufn,010
+kas,011
+shp,012
+tst,013
+gty,014
+fmp,015
+sdp,016
+ncp,017
+psk,018
+nvr,077
+she,084
+btc,085
+ins,089
+ctr,090
+sku,091
+bpr,019
+bfp,020
+bfd,021
+bml,022
+apd,078
+blf,079
+slp,080
+vrt,081
+fni,082
+sid,083
+mso,086
+cng,023
+lyr,024
+dbv,025
+fur,026
+ums,027
+skd,028
+ups,029
+mdk,030
+fvi,031
+mac,032
+fpi,033
+tr0,034
+tr1,035
+e00,036
+e01,037
+e02,038
+e03,039
+e04,040
+e05,041
+e06,042
+e07,043
+e08,044
+e09,045
+e10,046
+e11,047
+e12,048
+e13,049
+e14,050
+e15,051
+e16,052
+e17,053
+e18,054
+e19,055
+e20,056
+e21,057
+e22,058
+e23,059
+e24,060
+e25,061
+e26,062
+e27,063
+e28,064
+e29,065
+e30,066
+e31,067
+clv,068
+sps,069
+rbt,070
+edw,071
+bti,072
+hdi,073
+lbi,074
+fui,075
+eri,076
+pci,087
+dbi,088
diff --git a/utils/nwztools/database/nwz_db.c b/utils/nwztools/database/nwz_db.c
index 3288fc1..ec58451 100644
--- a/utils/nwztools/database/nwz_db.c
+++ b/utils/nwztools/database/nwz_db.c
@@ -207,121 +207,6 @@ struct nwz_model_info_t nwz_model[NWZ_MODEL_COUNT] =
{ 0x1d000007, "NW-A28" },
};
-static int nvp_index_28dc2c[NWZ_NVP_COUNT] =
-{
- [NWZ_NVP_APD] = 78,
- [NWZ_NVP_APP] = NWZ_NVP_INVALID,
- [NWZ_NVP_BFD] = 21,
- [NWZ_NVP_BFP] = 20,
- [NWZ_NVP_BLF] = 79,
- [NWZ_NVP_BML] = 22,
- [NWZ_NVP_BOK] = 4,
- [NWZ_NVP_BPR] = 19,
- [NWZ_NVP_BTC] = 85,
- [NWZ_NVP_BTI] = 72,
- [NWZ_NVP_CGP] = NWZ_NVP_INVALID,
- [NWZ_NVP_CLV] = 68,
- [NWZ_NVP_CNG] = 23,
- [NWZ_NVP_CTR] = NWZ_NVP_INVALID,
- [NWZ_NVP_DBA] = 24,
- [NWZ_NVP_DBG] = 0,
- [NWZ_NVP_DBI] = NWZ_NVP_INVALID,
- [NWZ_NVP_DBV] = 25,
- [NWZ_NVP_DCC] = 31,
- [NWZ_NVP_DOR] = 26,
- [NWZ_NVP_E00] = 36,
- [NWZ_NVP_E01] = 37,
- [NWZ_NVP_E02] = 38,
- [NWZ_NVP_E03] = 39,
- [NWZ_NVP_E04] = 40,
- [NWZ_NVP_E05] = 41,
- [NWZ_NVP_E06] = 42,
- [NWZ_NVP_E07] = 43,
- [NWZ_NVP_E08] = 44,
- [NWZ_NVP_E09] = 45,
- [NWZ_NVP_E10] = 46,
- [NWZ_NVP_E11] = 47,
- [NWZ_NVP_E12] = 48,
- [NWZ_NVP_E13] = 49,
- [NWZ_NVP_E14] = 50,
- [NWZ_NVP_E15] = 51,
- [NWZ_NVP_E16] = 52,
- [NWZ_NVP_E17] = 53,
- [NWZ_NVP_E18] = 54,
- [NWZ_NVP_E19] = 55,
- [NWZ_NVP_E20] = 56,
- [NWZ_NVP_E21] = 57,
- [NWZ_NVP_E22] = 58,
- [NWZ_NVP_E23] = 59,
- [NWZ_NVP_E24] = 60,
- [NWZ_NVP_E25] = 61,
- [NWZ_NVP_E26] = 62,
- [NWZ_NVP_E27] = 63,
- [NWZ_NVP_E28] = 64,
- [NWZ_NVP_E29] = 65,
- [NWZ_NVP_E30] = 66,
- [NWZ_NVP_E31] = 67,
- [NWZ_NVP_EDW] = 71,
- [NWZ_NVP_ERI] = 76,
- [NWZ_NVP_EXM] = NWZ_NVP_INVALID,
- [NWZ_NVP_FMP] = 15,
- [NWZ_NVP_FNI] = 82,
- [NWZ_NVP_FPI] = NWZ_NVP_INVALID,
- [NWZ_NVP_FUI] = 75,
- [NWZ_NVP_FUP] = 3,
- [NWZ_NVP_FUR] = NWZ_NVP_INVALID,
- [NWZ_NVP_FVI] = NWZ_NVP_INVALID,
- [NWZ_NVP_GTY] = 14,
- [NWZ_NVP_HDI] = 73,
- [NWZ_NVP_HLD] = 5,
- [NWZ_NVP_INS] = NWZ_NVP_INVALID,
- [NWZ_NVP_IPT] = NWZ_NVP_INVALID,
- [NWZ_NVP_KAS] = 11,
- [NWZ_NVP_LBI] = 74,
- [NWZ_NVP_LYR] = NWZ_NVP_INVALID,
- [NWZ_NVP_MAC] = NWZ_NVP_INVALID,
- [NWZ_NVP_MCR] = NWZ_NVP_INVALID,
- [NWZ_NVP_MDK] = 30,
- [NWZ_NVP_MDL] = 70,
- [NWZ_NVP_MID] = 7,
- [NWZ_NVP_MLK] = 84,
- [NWZ_NVP_MSC] = NWZ_NVP_INVALID,
- [NWZ_NVP_MSO] = 86,
- [NWZ_NVP_MTM] = 33,
- [NWZ_NVP_MUK] = NWZ_NVP_INVALID,
- [NWZ_NVP_NCP] = 17,
- [NWZ_NVP_NVR] = NWZ_NVP_INVALID,
- [NWZ_NVP_PCD] = 8,
- [NWZ_NVP_PCI] = NWZ_NVP_INVALID,
- [NWZ_NVP_PRK] = NWZ_NVP_INVALID,
- [NWZ_NVP_PSK] = 18,
- [NWZ_NVP_PTS] = 77,
- [NWZ_NVP_RBT] = NWZ_NVP_INVALID,
- [NWZ_NVP_RND] = 27,
- [NWZ_NVP_RTC] = 6,
- [NWZ_NVP_SDC] = NWZ_NVP_INVALID,
- [NWZ_NVP_SDP] = 16,
- [NWZ_NVP_SER] = 9,
- [NWZ_NVP_SFI] = 29,
- [NWZ_NVP_SHE] = NWZ_NVP_INVALID,
- [NWZ_NVP_SHP] = 12,
- [NWZ_NVP_SID] = 83,
- [NWZ_NVP_SKD] = 28,
- [NWZ_NVP_SKT] = 32,
- [NWZ_NVP_SKU] = NWZ_NVP_INVALID,
- [NWZ_NVP_SLP] = 80,
- [NWZ_NVP_SPS] = 69,
- [NWZ_NVP_SYI] = 1,
- [NWZ_NVP_TR0] = 34,
- [NWZ_NVP_TR1] = 35,
- [NWZ_NVP_TST] = 13,
- [NWZ_NVP_UBP] = 2,
- [NWZ_NVP_UFN] = 10,
- [NWZ_NVP_UMS] = NWZ_NVP_INVALID,
- [NWZ_NVP_UPS] = NWZ_NVP_INVALID,
- [NWZ_NVP_VRT] = 81,
-};
-
static int nvp_index_0ac81d[NWZ_NVP_COUNT] =
{
[NWZ_NVP_APD] = 78,
@@ -437,28 +322,28 @@ static int nvp_index_0ac81d[NWZ_NVP_COUNT] =
[NWZ_NVP_VRT] = NWZ_NVP_INVALID,
};
-static int nvp_index_f505c8[NWZ_NVP_COUNT] =
+static int nvp_index_28dc2c[NWZ_NVP_COUNT] =
{
[NWZ_NVP_APD] = 78,
- [NWZ_NVP_APP] = 5,
- [NWZ_NVP_BFD] = 88,
- [NWZ_NVP_BFP] = 89,
+ [NWZ_NVP_APP] = NWZ_NVP_INVALID,
+ [NWZ_NVP_BFD] = 21,
+ [NWZ_NVP_BFP] = 20,
[NWZ_NVP_BLF] = 79,
- [NWZ_NVP_BML] = 87,
- [NWZ_NVP_BOK] = 10,
- [NWZ_NVP_BPR] = 35,
- [NWZ_NVP_BTC] = 27,
- [NWZ_NVP_BTI] = 1,
+ [NWZ_NVP_BML] = 22,
+ [NWZ_NVP_BOK] = 4,
+ [NWZ_NVP_BPR] = 19,
+ [NWZ_NVP_BTC] = 85,
+ [NWZ_NVP_BTI] = 72,
[NWZ_NVP_CGP] = NWZ_NVP_INVALID,
[NWZ_NVP_CLV] = 68,
- [NWZ_NVP_CNG] = 3,
+ [NWZ_NVP_CNG] = 23,
[NWZ_NVP_CTR] = NWZ_NVP_INVALID,
- [NWZ_NVP_DBA] = 12,
+ [NWZ_NVP_DBA] = 24,
[NWZ_NVP_DBG] = 0,
[NWZ_NVP_DBI] = NWZ_NVP_INVALID,
- [NWZ_NVP_DBV] = 13,
- [NWZ_NVP_DCC] = 7,
- [NWZ_NVP_DOR] = 21,
+ [NWZ_NVP_DBV] = 25,
+ [NWZ_NVP_DCC] = 31,
+ [NWZ_NVP_DOR] = 26,
[NWZ_NVP_E00] = 36,
[NWZ_NVP_E01] = 37,
[NWZ_NVP_E02] = 38,
@@ -491,65 +376,65 @@ static int nvp_index_f505c8[NWZ_NVP_COUNT] =
[NWZ_NVP_E29] = 65,
[NWZ_NVP_E30] = 66,
[NWZ_NVP_E31] = 67,
- [NWZ_NVP_EDW] = 22,
- [NWZ_NVP_ERI] = 6,
- [NWZ_NVP_EXM] = 25,
- [NWZ_NVP_FMP] = 82,
- [NWZ_NVP_FNI] = NWZ_NVP_INVALID,
+ [NWZ_NVP_EDW] = 71,
+ [NWZ_NVP_ERI] = 76,
+ [NWZ_NVP_EXM] = NWZ_NVP_INVALID,
+ [NWZ_NVP_FMP] = 15,
+ [NWZ_NVP_FNI] = 82,
[NWZ_NVP_FPI] = NWZ_NVP_INVALID,
- [NWZ_NVP_FUI] = 19,
- [NWZ_NVP_FUP] = 9,
+ [NWZ_NVP_FUI] = 75,
+ [NWZ_NVP_FUP] = 3,
[NWZ_NVP_FUR] = NWZ_NVP_INVALID,
[NWZ_NVP_FVI] = NWZ_NVP_INVALID,
- [NWZ_NVP_GTY] = 18,
- [NWZ_NVP_HDI] = 2,
- [NWZ_NVP_HLD] = 80,
+ [NWZ_NVP_GTY] = 14,
+ [NWZ_NVP_HDI] = 73,
+ [NWZ_NVP_HLD] = 5,
[NWZ_NVP_INS] = NWZ_NVP_INVALID,
- [NWZ_NVP_IPT] = 70,
- [NWZ_NVP_KAS] = 32,
- [NWZ_NVP_LBI] = 20,
+ [NWZ_NVP_IPT] = NWZ_NVP_INVALID,
+ [NWZ_NVP_KAS] = 11,
+ [NWZ_NVP_LBI] = 74,
[NWZ_NVP_LYR] = NWZ_NVP_INVALID,
- [NWZ_NVP_MAC] = 77,
- [NWZ_NVP_MCR] = 72,
- [NWZ_NVP_MDK] = 73,
- [NWZ_NVP_MDL] = 8,
- [NWZ_NVP_MID] = 16,
- [NWZ_NVP_MLK] = NWZ_NVP_INVALID,
- [NWZ_NVP_MSC] = 84,
- [NWZ_NVP_MSO] = NWZ_NVP_INVALID,
- [NWZ_NVP_MTM] = 71,
- [NWZ_NVP_MUK] = 74,
- [NWZ_NVP_NCP] = 31,
+ [NWZ_NVP_MAC] = NWZ_NVP_INVALID,
+ [NWZ_NVP_MCR] = NWZ_NVP_INVALID,
+ [NWZ_NVP_MDK] = 30,
+ [NWZ_NVP_MDL] = 70,
+ [NWZ_NVP_MID] = 7,
+ [NWZ_NVP_MLK] = 84,
+ [NWZ_NVP_MSC] = NWZ_NVP_INVALID,
+ [NWZ_NVP_MSO] = 86,
+ [NWZ_NVP_MTM] = 33,
+ [NWZ_NVP_MUK] = NWZ_NVP_INVALID,
+ [NWZ_NVP_NCP] = 17,
[NWZ_NVP_NVR] = NWZ_NVP_INVALID,
- [NWZ_NVP_PCD] = 26,
+ [NWZ_NVP_PCD] = 8,
[NWZ_NVP_PCI] = NWZ_NVP_INVALID,
[NWZ_NVP_PRK] = NWZ_NVP_INVALID,
- [NWZ_NVP_PSK] = 86,
- [NWZ_NVP_PTS] = 75,
+ [NWZ_NVP_PSK] = 18,
+ [NWZ_NVP_PTS] = 77,
[NWZ_NVP_RBT] = NWZ_NVP_INVALID,
- [NWZ_NVP_RND] = 28,
- [NWZ_NVP_RTC] = 34,
+ [NWZ_NVP_RND] = 27,
+ [NWZ_NVP_RTC] = 6,
[NWZ_NVP_SDC] = NWZ_NVP_INVALID,
- [NWZ_NVP_SDP] = 30,
- [NWZ_NVP_SER] = 4,
- [NWZ_NVP_SFI] = 33,
+ [NWZ_NVP_SDP] = 16,
+ [NWZ_NVP_SER] = 9,
+ [NWZ_NVP_SFI] = 29,
[NWZ_NVP_SHE] = NWZ_NVP_INVALID,
- [NWZ_NVP_SHP] = 11,
- [NWZ_NVP_SID] = NWZ_NVP_INVALID,
- [NWZ_NVP_SKD] = 81,
- [NWZ_NVP_SKT] = 76,
+ [NWZ_NVP_SHP] = 12,
+ [NWZ_NVP_SID] = 83,
+ [NWZ_NVP_SKD] = 28,
+ [NWZ_NVP_SKT] = 32,
[NWZ_NVP_SKU] = NWZ_NVP_INVALID,
- [NWZ_NVP_SLP] = 69,
- [NWZ_NVP_SPS] = 83,
- [NWZ_NVP_SYI] = 24,
- [NWZ_NVP_TR0] = 14,
- [NWZ_NVP_TR1] = 15,
- [NWZ_NVP_TST] = 17,
- [NWZ_NVP_UBP] = 23,
- [NWZ_NVP_UFN] = 29,
+ [NWZ_NVP_SLP] = 80,
+ [NWZ_NVP_SPS] = 69,
+ [NWZ_NVP_SYI] = 1,
+ [NWZ_NVP_TR0] = 34,
+ [NWZ_NVP_TR1] = 35,
+ [NWZ_NVP_TST] = 13,
+ [NWZ_NVP_UBP] = 2,
+ [NWZ_NVP_UFN] = 10,
[NWZ_NVP_UMS] = NWZ_NVP_INVALID,
[NWZ_NVP_UPS] = NWZ_NVP_INVALID,
- [NWZ_NVP_VRT] = 85,
+ [NWZ_NVP_VRT] = 81,
};
static int nvp_index_398250[NWZ_NVP_COUNT] =
@@ -1012,6 +897,121 @@ static int nvp_index_c8fc85[NWZ_NVP_COUNT] =
[NWZ_NVP_VRT] = 85,
};
+static int nvp_index_f505c8[NWZ_NVP_COUNT] =
+{
+ [NWZ_NVP_APD] = 78,
+ [NWZ_NVP_APP] = 5,
+ [NWZ_NVP_BFD] = 88,
+ [NWZ_NVP_BFP] = 89,
+ [NWZ_NVP_BLF] = 79,
+ [NWZ_NVP_BML] = 87,
+ [NWZ_NVP_BOK] = 10,
+ [NWZ_NVP_BPR] = 35,
+ [NWZ_NVP_BTC] = 27,
+ [NWZ_NVP_BTI] = 1,
+ [NWZ_NVP_CGP] = NWZ_NVP_INVALID,
+ [NWZ_NVP_CLV] = 68,
+ [NWZ_NVP_CNG] = 3,
+ [NWZ_NVP_CTR] = NWZ_NVP_INVALID,
+ [NWZ_NVP_DBA] = 12,
+ [NWZ_NVP_DBG] = 0,
+ [NWZ_NVP_DBI] = NWZ_NVP_INVALID,
+ [NWZ_NVP_DBV] = 13,
+ [NWZ_NVP_DCC] = 7,
+ [NWZ_NVP_DOR] = 21,
+ [NWZ_NVP_E00] = 36,
+ [NWZ_NVP_E01] = 37,
+ [NWZ_NVP_E02] = 38,
+ [NWZ_NVP_E03] = 39,
+ [NWZ_NVP_E04] = 40,
+ [NWZ_NVP_E05] = 41,
+ [NWZ_NVP_E06] = 42,
+ [NWZ_NVP_E07] = 43,
+ [NWZ_NVP_E08] = 44,
+ [NWZ_NVP_E09] = 45,
+ [NWZ_NVP_E10] = 46,
+ [NWZ_NVP_E11] = 47,
+ [NWZ_NVP_E12] = 48,
+ [NWZ_NVP_E13] = 49,
+ [NWZ_NVP_E14] = 50,
+ [NWZ_NVP_E15] = 51,
+ [NWZ_NVP_E16] = 52,
+ [NWZ_NVP_E17] = 53,
+ [NWZ_NVP_E18] = 54,
+ [NWZ_NVP_E19] = 55,
+ [NWZ_NVP_E20] = 56,
+ [NWZ_NVP_E21] = 57,
+ [NWZ_NVP_E22] = 58,
+ [NWZ_NVP_E23] = 59,
+ [NWZ_NVP_E24] = 60,
+ [NWZ_NVP_E25] = 61,
+ [NWZ_NVP_E26] = 62,
+ [NWZ_NVP_E27] = 63,
+ [NWZ_NVP_E28] = 64,
+ [NWZ_NVP_E29] = 65,
+ [NWZ_NVP_E30] = 66,
+ [NWZ_NVP_E31] = 67,
+ [NWZ_NVP_EDW] = 22,
+ [NWZ_NVP_ERI] = 6,
+ [NWZ_NVP_EXM] = 25,
+ [NWZ_NVP_FMP] = 82,
+ [NWZ_NVP_FNI] = NWZ_NVP_INVALID,
+ [NWZ_NVP_FPI] = NWZ_NVP_INVALID,
+ [NWZ_NVP_FUI] = 19,
+ [NWZ_NVP_FUP] = 9,
+ [NWZ_NVP_FUR] = NWZ_NVP_INVALID,
+ [NWZ_NVP_FVI] = NWZ_NVP_INVALID,
+ [NWZ_NVP_GTY] = 18,
+ [NWZ_NVP_HDI] = 2,
+ [NWZ_NVP_HLD] = 80,
+ [NWZ_NVP_INS] = NWZ_NVP_INVALID,
+ [NWZ_NVP_IPT] = 70,
+ [NWZ_NVP_KAS] = 32,
+ [NWZ_NVP_LBI] = 20,
+ [NWZ_NVP_LYR] = NWZ_NVP_INVALID,
+ [NWZ_NVP_MAC] = 77,
+ [NWZ_NVP_MCR] = 72,
+ [NWZ_NVP_MDK] = 73,
+ [NWZ_NVP_MDL] = 8,
+ [NWZ_NVP_MID] = 16,
+ [NWZ_NVP_MLK] = NWZ_NVP_INVALID,
+ [NWZ_NVP_MSC] = 84,
+ [NWZ_NVP_MSO] = NWZ_NVP_INVALID,
+ [NWZ_NVP_MTM] = 71,
+ [NWZ_NVP_MUK] = 74,
+ [NWZ_NVP_NCP] = 31,
+ [NWZ_NVP_NVR] = NWZ_NVP_INVALID,
+ [NWZ_NVP_PCD] = 26,
+ [NWZ_NVP_PCI] = NWZ_NVP_INVALID,
+ [NWZ_NVP_PRK] = NWZ_NVP_INVALID,
+ [NWZ_NVP_PSK] = 86,
+ [NWZ_NVP_PTS] = 75,
+ [NWZ_NVP_RBT] = NWZ_NVP_INVALID,
+ [NWZ_NVP_RND] = 28,
+ [NWZ_NVP_RTC] = 34,
+ [NWZ_NVP_SDC] = NWZ_NVP_INVALID,
+ [NWZ_NVP_SDP] = 30,
+ [NWZ_NVP_SER] = 4,
+ [NWZ_NVP_SFI] = 33,
+ [NWZ_NVP_SHE] = NWZ_NVP_INVALID,
+ [NWZ_NVP_SHP] = 11,
+ [NWZ_NVP_SID] = NWZ_NVP_INVALID,
+ [NWZ_NVP_SKD] = 81,
+ [NWZ_NVP_SKT] = 76,
+ [NWZ_NVP_SKU] = NWZ_NVP_INVALID,
+ [NWZ_NVP_SLP] = 69,
+ [NWZ_NVP_SPS] = 83,
+ [NWZ_NVP_SYI] = 24,
+ [NWZ_NVP_TR0] = 14,
+ [NWZ_NVP_TR1] = 15,
+ [NWZ_NVP_TST] = 17,
+ [NWZ_NVP_UBP] = 23,
+ [NWZ_NVP_UFN] = 29,
+ [NWZ_NVP_UMS] = NWZ_NVP_INVALID,
+ [NWZ_NVP_UPS] = NWZ_NVP_INVALID,
+ [NWZ_NVP_VRT] = 85,
+};
+
struct nwz_nvp_info_t nwz_nvp[NWZ_NVP_COUNT] =
{
[NWZ_NVP_APD] = { "apd", 4, "application debug mode flag" },
@@ -1031,7 +1031,7 @@ struct nwz_nvp_info_t nwz_nvp[NWZ_NVP_COUNT] =
[NWZ_NVP_DBA] = { "dba", 160, "aad icv" },
[NWZ_NVP_DBG] = { "dbg", 0, "" },
[NWZ_NVP_DBI] = { "dbi", 262144, "dead battery image" },
- [NWZ_NVP_DBV] = { "dbv", 520, "empr icv | empr key" },
+ [NWZ_NVP_DBV] = { "dbv", 520, "empr key | empr icv" },
[NWZ_NVP_DCC] = { "dcc", 20, "secure clock" },
[NWZ_NVP_DOR] = { "dor", 4, "key mode (debug/release)" },
[NWZ_NVP_E00] = { "e00", 1024, "EMPR 0" },
@@ -1217,6 +1217,8 @@ static unsigned long models_nwz_s770[] = { 0x16000001, 0x16000002, 0x16000004,
static unsigned long models_nw_s780[] = { 0x19000001, 0x19000002, 0x19000004,
0x19000005 };
+static unsigned long models_nw_wm1[] = { };
+
static unsigned long models_nwz_x1000[] = { 0x5000002, 0x5000004, 0x5000005,
0x5020002, 0x5040002, 0x5020004, 0x5040004, 0x5020005, 0x5040005 };
@@ -1261,6 +1263,7 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] =
{ "nwz-s760", "NWZ-S740 Series", 10, models_nwz_s760, &nvp_index_f505c8 },
{ "nwz-s770", "NWZ-S770 Series", 8, models_nwz_s770, 0 },
{ "nw-s780", "NW-S780 Series", 4, models_nw_s780, &nvp_index_6485c8 },
+ { "nw-wm1", "NW-WM1 Series", 0, models_nw_wm1, &nvp_index_398250 },
{ "nwz-x1000", "NWZ-X1000 Series", 9, models_nwz_x1000, 0 },
{ "nw-zx100", "NW-ZX100 Series", 6, models_nw_zx100, 0 },
{ "nwz-zx2", "NW-ZX2", 0, models_nwz_zx2, &nvp_index_c8fc85 },
diff --git a/utils/nwztools/database/nwz_db.h b/utils/nwztools/database/nwz_db.h
index 95aff48..f7af2e9 100644
--- a/utils/nwztools/database/nwz_db.h
+++ b/utils/nwztools/database/nwz_db.h
@@ -42,7 +42,7 @@ enum nwz_nvp_node_t
NWZ_NVP_DBA, /* aad icv */
NWZ_NVP_DBG, /* */
NWZ_NVP_DBI, /* dead battery image */
- NWZ_NVP_DBV, /* empr icv | empr key */
+ NWZ_NVP_DBV, /* empr key | empr icv */
NWZ_NVP_DCC, /* secure clock */
NWZ_NVP_DOR, /* key mode (debug/release) */
NWZ_NVP_E00, /* EMPR 0 */
@@ -144,7 +144,7 @@ enum nwz_nvp_node_t
/* Number of models */
#define NWZ_MODEL_COUNT 181
/* Number of series */
-#define NWZ_SERIES_COUNT 36
+#define NWZ_SERIES_COUNT 37
/* NVP node info */
struct nwz_nvp_info_t
diff --git a/utils/nwztools/database/series.txt b/utils/nwztools/database/series.txt
index bef49ee..48e54ab 100644
--- a/utils/nwztools/database/series.txt
+++ b/utils/nwztools/database/series.txt
@@ -30,6 +30,7 @@ nwz-s750,NWZ-S740 Series,0x9000002,0x9000004,0x9000005,0xf000002,0xf000004
nwz-s760,NWZ-S740 Series,0x12000001,0x12000002,0x12000004,0x12000005,0x12000006,0x12010001,0x12010002,0x12010004,0x12010005,0x12010006
nwz-s770,NWZ-S770 Series,0x16000001,0x16000002,0x16000004,0x16000005,0x16010001,0x16010002,0x16010004,0x16010005
nw-s780,NW-S780 Series,0x19000001,0x19000002,0x19000004,0x19000005
+nw-wm1,NW-WM1 Series,
nwz-x1000,NWZ-X1000 Series,0x5000002,0x5000004,0x5000005,0x5020002,0x5040002,0x5020004,0x5040004,0x5020005,0x5040005
nw-zx100,NW-ZX100 Series,0x1c000007,0x1c000001,0x1c000002,0x1c000004,0x1c000005,0x1c000006
nwz-zx2,NW-ZX2,