nwztools/database: misc improvements

* make gen_db.py work on Windows/Python 2

- use hashlib module instead of md5sum, also don't rely on / for file path
matching
- don't use 'file' for a variable name

* fix parse_nvp_header.sh for older kernels

pre-emmc kernel sources use a slightly different #define format; adjust
regexp to catch it.

* add nwz-x1000 series NVP layout (from icx1087_nvp.h)

some new tags have no description, alas the driver doesn't have
them :/

*  minor fixes to nvp/README

fixed typos/wording

Change-Id: I77d8c2704be2f2316e32aadcfd362df7102360d4

1 files changed, 187 insertions, 1 deletions

diff --git a/utils/nwztools/database/nwz_db.c b/utils/nwztools/database/nwz_db.c
index d5c226203b..e77b86e729 100644
--- a/utils/nwztools/database/nwz_db.c
+++ b/utils/nwztools/database/nwz_db.c
@@ -228,8 +228,11 @@ static int nvp_index_0ac81d[NWZ_NVP_COUNT] =
     [NWZ_NVP_DBA] = 12,
     [NWZ_NVP_DBG] = 0,
     [NWZ_NVP_DBI] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DBS] = NWZ_NVP_INVALID,
     [NWZ_NVP_DBV] = 13,
     [NWZ_NVP_DCC] = 7,
+    [NWZ_NVP_DG0] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DG1] = NWZ_NVP_INVALID,
     [NWZ_NVP_DOR] = 21,
     [NWZ_NVP_E00] = 36,
     [NWZ_NVP_E01] = 37,
@@ -264,6 +267,10 @@ static int nvp_index_0ac81d[NWZ_NVP_COUNT] =
     [NWZ_NVP_E30] = 66,
     [NWZ_NVP_E31] = 67,
     [NWZ_NVP_EDW] = 22,
+    [NWZ_NVP_EP0] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EP1] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EP2] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EP3] = NWZ_NVP_INVALID,
     [NWZ_NVP_ERI] = 6,
     [NWZ_NVP_EXM] = 25,
     [NWZ_NVP_FMP] = 82,
@@ -295,6 +302,7 @@ static int nvp_index_0ac81d[NWZ_NVP_COUNT] =
     [NWZ_NVP_NVR] = NWZ_NVP_INVALID,
     [NWZ_NVP_PCD] = 26,
     [NWZ_NVP_PCI] = NWZ_NVP_INVALID,
+    [NWZ_NVP_PNC] = NWZ_NVP_INVALID,
     [NWZ_NVP_PRK] = NWZ_NVP_INVALID,
     [NWZ_NVP_PSK] = NWZ_NVP_INVALID,
     [NWZ_NVP_PTS] = 75,
@@ -321,6 +329,7 @@ static int nvp_index_0ac81d[NWZ_NVP_COUNT] =
     [NWZ_NVP_UFN] = 29,
     [NWZ_NVP_UMS] = NWZ_NVP_INVALID,
     [NWZ_NVP_UPS] = NWZ_NVP_INVALID,
+    [NWZ_NVP_VAR] = NWZ_NVP_INVALID,
     [NWZ_NVP_VRT] = NWZ_NVP_INVALID,
 };
 
@@ -342,8 +351,11 @@ static int nvp_index_28dc2c[NWZ_NVP_COUNT] =
     [NWZ_NVP_DBA] = 24,
     [NWZ_NVP_DBG] = 0,
     [NWZ_NVP_DBI] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DBS] = NWZ_NVP_INVALID,
     [NWZ_NVP_DBV] = 25,
     [NWZ_NVP_DCC] = 31,
+    [NWZ_NVP_DG0] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DG1] = NWZ_NVP_INVALID,
     [NWZ_NVP_DOR] = 26,
     [NWZ_NVP_E00] = 36,
     [NWZ_NVP_E01] = 37,
@@ -378,6 +390,10 @@ static int nvp_index_28dc2c[NWZ_NVP_COUNT] =
     [NWZ_NVP_E30] = 66,
     [NWZ_NVP_E31] = 67,
     [NWZ_NVP_EDW] = 71,
+    [NWZ_NVP_EP0] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EP1] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EP2] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EP3] = NWZ_NVP_INVALID,
     [NWZ_NVP_ERI] = 76,
     [NWZ_NVP_EXM] = NWZ_NVP_INVALID,
     [NWZ_NVP_FMP] = 15,
@@ -409,6 +425,7 @@ static int nvp_index_28dc2c[NWZ_NVP_COUNT] =
     [NWZ_NVP_NVR] = NWZ_NVP_INVALID,
     [NWZ_NVP_PCD] = 8,
     [NWZ_NVP_PCI] = NWZ_NVP_INVALID,
+    [NWZ_NVP_PNC] = NWZ_NVP_INVALID,
     [NWZ_NVP_PRK] = NWZ_NVP_INVALID,
     [NWZ_NVP_PSK] = 18,
     [NWZ_NVP_PTS] = 77,
@@ -435,6 +452,7 @@ static int nvp_index_28dc2c[NWZ_NVP_COUNT] =
     [NWZ_NVP_UFN] = 10,
     [NWZ_NVP_UMS] = NWZ_NVP_INVALID,
     [NWZ_NVP_UPS] = NWZ_NVP_INVALID,
+    [NWZ_NVP_VAR] = NWZ_NVP_INVALID,
     [NWZ_NVP_VRT] = 81,
 };
 
@@ -456,8 +474,11 @@ static int nvp_index_398250[NWZ_NVP_COUNT] =
     [NWZ_NVP_DBA] = NWZ_NVP_INVALID,
     [NWZ_NVP_DBG] = 0,
     [NWZ_NVP_DBI] = 88,
+    [NWZ_NVP_DBS] = NWZ_NVP_INVALID,
     [NWZ_NVP_DBV] = 25,
     [NWZ_NVP_DCC] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DG0] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DG1] = NWZ_NVP_INVALID,
     [NWZ_NVP_DOR] = NWZ_NVP_INVALID,
     [NWZ_NVP_E00] = 36,
     [NWZ_NVP_E01] = 37,
@@ -492,6 +513,10 @@ static int nvp_index_398250[NWZ_NVP_COUNT] =
     [NWZ_NVP_E30] = 66,
     [NWZ_NVP_E31] = 67,
     [NWZ_NVP_EDW] = 71,
+    [NWZ_NVP_EP0] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EP1] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EP2] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EP3] = NWZ_NVP_INVALID,
     [NWZ_NVP_ERI] = 76,
     [NWZ_NVP_EXM] = NWZ_NVP_INVALID,
     [NWZ_NVP_FMP] = 15,
@@ -523,6 +548,7 @@ static int nvp_index_398250[NWZ_NVP_COUNT] =
     [NWZ_NVP_NVR] = 77,
     [NWZ_NVP_PCD] = 8,
     [NWZ_NVP_PCI] = 87,
+    [NWZ_NVP_PNC] = NWZ_NVP_INVALID,
     [NWZ_NVP_PRK] = 4,
     [NWZ_NVP_PSK] = 18,
     [NWZ_NVP_PTS] = NWZ_NVP_INVALID,
@@ -549,9 +575,133 @@ static int nvp_index_398250[NWZ_NVP_COUNT] =
     [NWZ_NVP_UFN] = 10,
     [NWZ_NVP_UMS] = 27,
     [NWZ_NVP_UPS] = 29,
+    [NWZ_NVP_VAR] = NWZ_NVP_INVALID,
     [NWZ_NVP_VRT] = 81,
 };
 
+static int nvp_index_4edba7[NWZ_NVP_COUNT] =
+{
+    [NWZ_NVP_APD] = 78,
+    [NWZ_NVP_APP] = 0,
+    [NWZ_NVP_BFD] = NWZ_NVP_INVALID,
+    [NWZ_NVP_BFP] = NWZ_NVP_INVALID,
+    [NWZ_NVP_BLF] = 79,
+    [NWZ_NVP_BML] = NWZ_NVP_INVALID,
+    [NWZ_NVP_BOK] = 10,
+    [NWZ_NVP_BPR] = 35,
+    [NWZ_NVP_BTC] = NWZ_NVP_INVALID,
+    [NWZ_NVP_BTI] = 1,
+    [NWZ_NVP_CLV] = 68,
+    [NWZ_NVP_CNG] = 3,
+    [NWZ_NVP_CTR] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DBA] = 12,
+    [NWZ_NVP_DBG] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DBI] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DBS] = 27,
+    [NWZ_NVP_DBV] = 13,
+    [NWZ_NVP_DCC] = 7,
+    [NWZ_NVP_DG0] = 5,
+    [NWZ_NVP_DG1] = 6,
+    [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_EP0] = 71,
+    [NWZ_NVP_EP1] = 72,
+    [NWZ_NVP_EP2] = 73,
+    [NWZ_NVP_EP3] = 74,
+    [NWZ_NVP_ERI] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EXM] = NWZ_NVP_INVALID,
+    [NWZ_NVP_FMP] = NWZ_NVP_INVALID,
+    [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] = NWZ_NVP_INVALID,
+    [NWZ_NVP_MDK] = NWZ_NVP_INVALID,
+    [NWZ_NVP_MDL] = 8,
+    [NWZ_NVP_MID] = 16,
+    [NWZ_NVP_MLK] = NWZ_NVP_INVALID,
+    [NWZ_NVP_MSC] = NWZ_NVP_INVALID,
+    [NWZ_NVP_MSO] = NWZ_NVP_INVALID,
+    [NWZ_NVP_MTM] = NWZ_NVP_INVALID,
+    [NWZ_NVP_MUK] = NWZ_NVP_INVALID,
+    [NWZ_NVP_NCP] = 31,
+    [NWZ_NVP_NVR] = NWZ_NVP_INVALID,
+    [NWZ_NVP_PCD] = 26,
+    [NWZ_NVP_PCI] = NWZ_NVP_INVALID,
+    [NWZ_NVP_PNC] = 33,
+    [NWZ_NVP_PRK] = NWZ_NVP_INVALID,
+    [NWZ_NVP_PSK] = NWZ_NVP_INVALID,
+    [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] = NWZ_NVP_INVALID,
+    [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] = NWZ_NVP_INVALID,
+    [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_VAR] = 25,
+    [NWZ_NVP_VRT] = NWZ_NVP_INVALID,
+};
+
 static int nvp_index_6485c8[NWZ_NVP_COUNT] =
 {
     [NWZ_NVP_APD] = 78,
@@ -570,8 +720,11 @@ static int nvp_index_6485c8[NWZ_NVP_COUNT] =
     [NWZ_NVP_DBA] = 24,
     [NWZ_NVP_DBG] = 0,
     [NWZ_NVP_DBI] = 88,
+    [NWZ_NVP_DBS] = NWZ_NVP_INVALID,
     [NWZ_NVP_DBV] = 25,
     [NWZ_NVP_DCC] = 31,
+    [NWZ_NVP_DG0] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DG1] = NWZ_NVP_INVALID,
     [NWZ_NVP_DOR] = 26,
     [NWZ_NVP_E00] = 36,
     [NWZ_NVP_E01] = 37,
@@ -606,6 +759,10 @@ static int nvp_index_6485c8[NWZ_NVP_COUNT] =
     [NWZ_NVP_E30] = 66,
     [NWZ_NVP_E31] = 67,
     [NWZ_NVP_EDW] = 71,
+    [NWZ_NVP_EP0] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EP1] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EP2] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EP3] = NWZ_NVP_INVALID,
     [NWZ_NVP_ERI] = 76,
     [NWZ_NVP_EXM] = NWZ_NVP_INVALID,
     [NWZ_NVP_FMP] = 15,
@@ -637,6 +794,7 @@ static int nvp_index_6485c8[NWZ_NVP_COUNT] =
     [NWZ_NVP_NVR] = NWZ_NVP_INVALID,
     [NWZ_NVP_PCD] = 8,
     [NWZ_NVP_PCI] = 87,
+    [NWZ_NVP_PNC] = NWZ_NVP_INVALID,
     [NWZ_NVP_PRK] = NWZ_NVP_INVALID,
     [NWZ_NVP_PSK] = 18,
     [NWZ_NVP_PTS] = 77,
@@ -663,6 +821,7 @@ static int nvp_index_6485c8[NWZ_NVP_COUNT] =
     [NWZ_NVP_UFN] = 10,
     [NWZ_NVP_UMS] = NWZ_NVP_INVALID,
     [NWZ_NVP_UPS] = NWZ_NVP_INVALID,
+    [NWZ_NVP_VAR] = NWZ_NVP_INVALID,
     [NWZ_NVP_VRT] = 81,
 };
 
@@ -684,8 +843,11 @@ static int nvp_index_92faee[NWZ_NVP_COUNT] =
     [NWZ_NVP_DBA] = 24,
     [NWZ_NVP_DBG] = 0,
     [NWZ_NVP_DBI] = 88,
+    [NWZ_NVP_DBS] = NWZ_NVP_INVALID,
     [NWZ_NVP_DBV] = 25,
     [NWZ_NVP_DCC] = 31,
+    [NWZ_NVP_DG0] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DG1] = NWZ_NVP_INVALID,
     [NWZ_NVP_DOR] = 26,
     [NWZ_NVP_E00] = 36,
     [NWZ_NVP_E01] = 37,
@@ -720,6 +882,10 @@ static int nvp_index_92faee[NWZ_NVP_COUNT] =
     [NWZ_NVP_E30] = 66,
     [NWZ_NVP_E31] = 67,
     [NWZ_NVP_EDW] = 71,
+    [NWZ_NVP_EP0] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EP1] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EP2] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EP3] = NWZ_NVP_INVALID,
     [NWZ_NVP_ERI] = 76,
     [NWZ_NVP_EXM] = NWZ_NVP_INVALID,
     [NWZ_NVP_FMP] = 15,
@@ -751,6 +917,7 @@ static int nvp_index_92faee[NWZ_NVP_COUNT] =
     [NWZ_NVP_NVR] = NWZ_NVP_INVALID,
     [NWZ_NVP_PCD] = 8,
     [NWZ_NVP_PCI] = 87,
+    [NWZ_NVP_PNC] = NWZ_NVP_INVALID,
     [NWZ_NVP_PRK] = NWZ_NVP_INVALID,
     [NWZ_NVP_PSK] = 18,
     [NWZ_NVP_PTS] = 77,
@@ -777,6 +944,7 @@ static int nvp_index_92faee[NWZ_NVP_COUNT] =
     [NWZ_NVP_UFN] = 10,
     [NWZ_NVP_UMS] = NWZ_NVP_INVALID,
     [NWZ_NVP_UPS] = NWZ_NVP_INVALID,
+    [NWZ_NVP_VAR] = NWZ_NVP_INVALID,
     [NWZ_NVP_VRT] = 81,
 };
 
@@ -798,8 +966,11 @@ static int nvp_index_f505c8[NWZ_NVP_COUNT] =
     [NWZ_NVP_DBA] = 12,
     [NWZ_NVP_DBG] = 0,
     [NWZ_NVP_DBI] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DBS] = NWZ_NVP_INVALID,
     [NWZ_NVP_DBV] = 13,
     [NWZ_NVP_DCC] = 7,
+    [NWZ_NVP_DG0] = NWZ_NVP_INVALID,
+    [NWZ_NVP_DG1] = NWZ_NVP_INVALID,
     [NWZ_NVP_DOR] = 21,
     [NWZ_NVP_E00] = 36,
     [NWZ_NVP_E01] = 37,
@@ -834,6 +1005,10 @@ static int nvp_index_f505c8[NWZ_NVP_COUNT] =
     [NWZ_NVP_E30] = 66,
     [NWZ_NVP_E31] = 67,
     [NWZ_NVP_EDW] = 22,
+    [NWZ_NVP_EP0] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EP1] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EP2] = NWZ_NVP_INVALID,
+    [NWZ_NVP_EP3] = NWZ_NVP_INVALID,
     [NWZ_NVP_ERI] = 6,
     [NWZ_NVP_EXM] = 25,
     [NWZ_NVP_FMP] = 82,
@@ -865,6 +1040,7 @@ static int nvp_index_f505c8[NWZ_NVP_COUNT] =
     [NWZ_NVP_NVR] = NWZ_NVP_INVALID,
     [NWZ_NVP_PCD] = 26,
     [NWZ_NVP_PCI] = NWZ_NVP_INVALID,
+    [NWZ_NVP_PNC] = NWZ_NVP_INVALID,
     [NWZ_NVP_PRK] = NWZ_NVP_INVALID,
     [NWZ_NVP_PSK] = 86,
     [NWZ_NVP_PTS] = 75,
@@ -891,6 +1067,7 @@ static int nvp_index_f505c8[NWZ_NVP_COUNT] =
     [NWZ_NVP_UFN] = 29,
     [NWZ_NVP_UMS] = NWZ_NVP_INVALID,
     [NWZ_NVP_UPS] = NWZ_NVP_INVALID,
+    [NWZ_NVP_VAR] = NWZ_NVP_INVALID,
     [NWZ_NVP_VRT] = 85,
 };
 
@@ -912,8 +1089,11 @@ 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_DBS] = { "dbs", 0, "" },
     [NWZ_NVP_DBV] = { "dbv", 520, "empr icv | empr key" },
     [NWZ_NVP_DCC] = { "dcc", 20, "secure clock" },
+    [NWZ_NVP_DG0] = { "dg0", 0, "" },
+    [NWZ_NVP_DG1] = { "dg1", 0, "" },
     [NWZ_NVP_DOR] = { "dor", 4, "key mode (debug/release)" },
     [NWZ_NVP_E00] = { "e00", 1024, "EMPR  0" },
     [NWZ_NVP_E01] = { "e01", 1024, "EMPR  1" },
@@ -948,6 +1128,10 @@ struct nwz_nvp_info_t nwz_nvp[NWZ_NVP_COUNT] =
     [NWZ_NVP_E30] = { "e30", 1024, "EMPR 30" },
     [NWZ_NVP_E31] = { "e31", 1024, "EMPR 31" },
     [NWZ_NVP_EDW] = { "edw", 4, "quick shutdown flag" },
+    [NWZ_NVP_EP0] = { "ep0", 0, "" },
+    [NWZ_NVP_EP1] = { "ep1", 0, "" },
+    [NWZ_NVP_EP2] = { "ep2", 0, "" },
+    [NWZ_NVP_EP3] = { "ep3", 0, "" },
     [NWZ_NVP_ERI] = { "eri", 262144, "update error image" },
     [NWZ_NVP_EXM] = { "exm", 4, "exception monitor mode" },
     [NWZ_NVP_FMP] = { "fmp", 16, "fm parameter" },
@@ -979,6 +1163,7 @@ struct nwz_nvp_info_t nwz_nvp[NWZ_NVP_COUNT] =
     [NWZ_NVP_NVR] = { "nvr", 0, "" },
     [NWZ_NVP_PCD] = { "pcd", 5, "product code" },
     [NWZ_NVP_PCI] = { "pci", 262144, "precharge image" },
+    [NWZ_NVP_PNC] = { "pnc", 0, "" },
     [NWZ_NVP_PRK] = { "prk", 0, "" },
     [NWZ_NVP_PSK] = { "psk", 512, "bluetooth pskey" },
     [NWZ_NVP_PTS] = { "pts", 4, "wifi protected setup" },
@@ -1005,6 +1190,7 @@ struct nwz_nvp_info_t nwz_nvp[NWZ_NVP_COUNT] =
     [NWZ_NVP_UFN] = { "ufn", 8, "update file name" },
     [NWZ_NVP_UMS] = { "ums", 0, "" },
     [NWZ_NVP_UPS] = { "ups", 0, "" },
+    [NWZ_NVP_VAR] = { "var", 0, "" },
     [NWZ_NVP_VRT] = { "vrt", 4, "europe vol regulation flag" },
 };
 
@@ -1143,7 +1329,7 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] =
     { "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", 2, models_nw_wm1, &nvp_index_398250 },
-    { "nwz-x1000", "NWZ-X1000 Series", 9, models_nwz_x1000, 0 },
+    { "nwz-x1000", "NWZ-X1000 Series", 9, models_nwz_x1000, &nvp_index_4edba7 },
     { "nw-zx100", "NW-ZX100 Series", 6, models_nw_zx100, &nvp_index_92faee },
     { "nwz-noname", "NONAME", 3, models_nwz_noname, 0 },
 };