From 03dd4b92be7dcd5c8ab06da3810887060e06abd5 Mon Sep 17 00:00:00 2001 From: Igor Skochinsky Date: Mon, 3 Apr 2017 15:13:46 +0200 Subject: 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 --- utils/nwztools/database/nvp/parse_nvp_header.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'utils/nwztools/database/nvp/parse_nvp_header.sh') diff --git a/utils/nwztools/database/nvp/parse_nvp_header.sh b/utils/nwztools/database/nvp/parse_nvp_header.sh index 8baab3c9eb..ee2be93516 100755 --- a/utils/nwztools/database/nvp/parse_nvp_header.sh +++ b/utils/nwztools/database/nvp/parse_nvp_header.sh @@ -66,13 +66,16 @@ else >&2 echo "Analyzing $FILE" fi +# old format: #define ICX1087_NVP_NODE_APP "/dev/icx1087_nvp/0" +# new format: #define ICX_NVP_NODE_APP ICX_NVP_NODE_BASE "0" + cat "$FILE" | awk ' \ BEGIN { \ - expr = "#define[[:space:]]+ICX_NVP_NODE_([[:alnum:]]+)[[:space:]]+ICX_NVP_NODE_BASE[[:space:]]*\"([[:digit:]]+)\""; \ + expr = "#define[[:space:]]+ICX[[:digit:]]*_NVP_NODE_([[:alnum:]]+)[[:space:]]+(ICX_NVP_NODE_BASE[[:space:]]*\"|\"/dev.*_nvp/)([[:digit:]]+)\""; } \ { \ if($0 ~ expr) \ { \ - print(tolower(gensub(expr, "\\1,\\2", "g", $0))); + print(tolower(gensub(expr, "\\1,\\3", "g", $0))); } \ }' -- cgit v1.2.3