From 1bd8207e3083c57773723277702de306afb84b4f Mon Sep 17 00:00:00 2001
From: Amaury Pouly <amaury.pouly@gmail.com>
Date: Sun, 8 Jan 2017 12:03:07 +0100
Subject: [PATCH] nwztools: rename nwz-a20 to nw-a20, that was a typo

Change-Id: I88ae7391732c6f41c3c4adccce2ddf0a92142067
---
 .../database/nvp/{nodes-nwz-a20.txt => nodes-nw-a20.txt}      | 0
 utils/nwztools/database/nvp/{nwz-a20.txt => nw-a20.txt}       | 0
 utils/nwztools/database/nwz_db.c                              | 4 ++--
 utils/nwztools/database/series.txt                            | 2 +-
 utils/nwztools/upgtools/upg.c                                 | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename utils/nwztools/database/nvp/{nodes-nwz-a20.txt => nodes-nw-a20.txt} (100%)
 rename utils/nwztools/database/nvp/{nwz-a20.txt => nw-a20.txt} (100%)

diff --git a/utils/nwztools/database/nvp/nodes-nwz-a20.txt b/utils/nwztools/database/nvp/nodes-nw-a20.txt
similarity index 100%
rename from utils/nwztools/database/nvp/nodes-nwz-a20.txt
rename to utils/nwztools/database/nvp/nodes-nw-a20.txt
diff --git a/utils/nwztools/database/nvp/nwz-a20.txt b/utils/nwztools/database/nvp/nw-a20.txt
similarity index 100%
rename from utils/nwztools/database/nvp/nwz-a20.txt
rename to utils/nwztools/database/nvp/nw-a20.txt
diff --git a/utils/nwztools/database/nwz_db.c b/utils/nwztools/database/nwz_db.c
index 3532223f19..9e45988189 100644
--- a/utils/nwztools/database/nwz_db.c
+++ b/utils/nwztools/database/nwz_db.c
@@ -1011,7 +1011,7 @@ static unsigned long models_nwz_a10[] = { 0x1a000001, 0x1a000002, 0x1a000004,
     0x1a000005, 0x1a000006, 0x1a010001, 0x1a010002, 0x1a010004, 0x1a010005,
     0x1a010006 };
 
-static unsigned long models_nwz_a20[] = { 0x1d000001, 0x1d000002, 0x1d000004,
+static unsigned long models_nw_a20[] = { 0x1d000001, 0x1d000002, 0x1d000004,
     0x1d000005, 0x1d000006, 0x1d000007 };
 
 static unsigned long models_nw_a30[] = {  };
@@ -1110,7 +1110,7 @@ static unsigned long models_nwz_noname[] = { 0x5010002, 0x5010004, 0x5010005 };
 struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] =
 {
     { "nwz-a10", "NWZ-A10 Series", 10, models_nwz_a10, &nvp_index_92faee },
-    { "nwz-a20", "NW-A20 Series", 6, models_nwz_a20, &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 },
     { "nwz-a720", "NWZ-A720 Series", 6, models_nwz_a720, 0 },
     { "nwz-a810", "NWZ-A810 Series", 3, models_nwz_a810, 0 },
diff --git a/utils/nwztools/database/series.txt b/utils/nwztools/database/series.txt
index f33f40311e..dff2cca4d0 100644
--- a/utils/nwztools/database/series.txt
+++ b/utils/nwztools/database/series.txt
@@ -1,5 +1,5 @@
 nwz-a10,NWZ-A10 Series,0x1a000001,0x1a000002,0x1a000004,0x1a000005,0x1a000006,0x1a010001,0x1a010002,0x1a010004,0x1a010005,0x1a010006
-nwz-a20,NW-A20 Series,0x1d000001,0x1d000002,0x1d000004,0x1d000005,0x1d000006,0x1d000007
+nw-a20,NW-A20 Series,0x1d000001,0x1d000002,0x1d000004,0x1d000005,0x1d000006,0x1d000007
 nw-a30,NW-A30 Series,
 nwz-a720,NWZ-A720 Series,0x3030001,0x3030002,0x3030004,0x3020001,0x3020002,0x3020004
 nwz-a810,NWZ-A810 Series,0x10000,0x10001,0x10002
diff --git a/utils/nwztools/upgtools/upg.c b/utils/nwztools/upgtools/upg.c
index 8a6a9f0754..f998af8d83 100644
--- a/utils/nwztools/upgtools/upg.c
+++ b/utils/nwztools/upgtools/upg.c
@@ -36,7 +36,7 @@ struct nwz_model_t g_model_list[] =
      * someone with a device needs to confirm that they work */
     { "nw-a820", false, "0c9869c268e0eaa6d1ba62daab09cebc" },
     { "nwz-a10", false, "a4605e0628c9c3baeb5142ce9cb834d6" },
-    { "nwz-a20", false, "e9d7185e5ac183bf26e9a5b66f983c0b" },
+    { "nw-a20", false, "e9d7185e5ac183bf26e9a5b66f983c0b" },
     { "nwz-zx100", false, "2c0bf029804f73e073154388743f84d2" },
     { 0 }
 };