mcux: scripts: pinctrl: update for v14 of the MEX utilities

Update pinctrl scripts for v14 of the MEX utilities, since
v13 is now legacy.

Signed-off-by: Daniel DeGrasse <[email protected]>

Author: danieldegrasse

mcux/scripts/pinctrl/README.md

@@ -12,8 +12,8 @@ processors
 ## Requirements
 
 All scripts here utilize files generated by with [MCUXpresso Config
-tools v13](https://www.nxp.com/design/software/development-software/mcuxpresso-software-and-tools-/mcuxpresso-config-tools-pins-clocks-peripherals:MCUXpresso-Config-Tools),
-and version 13 data packs downloaded from
+tools v14](https://www.nxp.com/design/software/development-software/mcuxpresso-software-and-tools-/mcuxpresso-config-tools-pins-clocks-peripherals:MCUXpresso-Config-Tools),
+and version 14 data packs downloaded from
 [MCUXpresso SDK builder](https://mcuxpresso.nxp.com/en/select_config_tools_data)
 No other version of MCUXpresso Config tools is supported.
 MCUXpresso config tools data sources must be provided to this tool, see below

mcux/scripts/pinctrl/gen_board_pinctrl.py

@@ -107,12 +107,15 @@ def main():
     """
     args = parse_args()
     utils = mex_utils.NxpMexUtil(args.mex_file)
+    pins_version = utils.get_pins_version()
+
+    if round(pins_version) != 14:
+        print("Warning: This tool is only verified for MEX files version 14, "
+            "other versions may not work")
+
     board_name = utils.get_board_name()
     processor_name = utils.get_processor_name()
     package_name = utils.get_package_name()
-    pins_version = utils.get_pins_version()
-    if not args.board_output:
-        args.board_output = f"{board_name.lower().replace('-', '_')}-pinctrl.dtsi"
 
     # Extract the Data pack to a temporary directory
     temp_dir = tempfile.TemporaryDirectory()
@@ -126,12 +129,13 @@ def main():
 
     print(f"Found data pack version {data_version}, pins version {pins_version} "
         f"for processor {processor_name}")
-    if round(data_version) != 13:
-        print("Warning: This tool is only verified for data pack version 13, "
-            "other versions may not work")
-    if round(pins_version) != 13:
-        print("Warning: This tool is only verified for MEX files version 13, "
+    if round(data_version) != 14:
+        print("Warning: This tool is only verified for data pack version 14, "
             "other versions may not work")
+
+    if not args.board_output:
+        args.board_output = f"{board_name.lower().replace('-', '_')}-pinctrl.dtsi"
+
     # Initialize SOC specific utility, and generate board pin control
     if args.copyright:
         # Add default copyright

mcux/scripts/pinctrl/gen_soc_headers.py

@@ -114,7 +114,7 @@ def main():
 
     data_version = get_pack_version(temp_dir.name)
     print(f"Found data pack version {data_version}")
-    if round(data_version) != 13:
+    if round(data_version) != 14:
         print("Warning: This tool is only verified for data pack version 13, "
             "other versions may not work")
 

mcux/scripts/pinctrl/imx/imx_cfg_utils.py

@@ -13,7 +13,7 @@
 import logging
 
 # MEX file has a default namespace, map it here
-NAMESPACES = {'mex' : 'http://mcuxpresso.nxp.com/XSD/mex_configuration_13'}
+NAMESPACES = {'mex' : 'http://mcuxpresso.nxp.com/XSD/mex_configuration_14'}
 
 class Peripheral:
     """
@@ -1216,8 +1216,7 @@ def get_processor_name(mexfile):
         processor = config_tree.getroot().find('mex:common/mex:processor',
             NAMESPACES)
         if processor is None:
-            raise RuntimeError("Cannot locate processor name in MEX file. "
-                "Are you using v12 of the MCUXpresso configuration tools?")
+            raise RuntimeError("Cannot locate processor name in MEX file.")
         return processor.text
     except ET.ParseError:
         logging.error("Malformed XML tree %s", mexfile)

mcux/scripts/pinctrl/kinetis/kinetis_cfg_utils.py

@@ -19,7 +19,7 @@
 PIN = collections.namedtuple('PIN', ['PERIPH', 'NAME_PART', 'SIGNAL', 'PORT',
                                      'PIN', 'CH', 'MUX_FUNC'])
 
-NAMESPACES = {'mex': 'http://mcuxpresso.nxp.com/XSD/mex_configuration_13'}
+NAMESPACES = {'mex': 'http://mcuxpresso.nxp.com/XSD/mex_configuration_14'}
 
 class MUXOption:
     """

mcux/scripts/pinctrl/lpc/lpc_cfg_utils.py

@@ -16,7 +16,7 @@
 import os
 import pathlib
 
-NAMESPACES = {'mex': 'http://mcuxpresso.nxp.com/XSD/mex_configuration_13'}
+NAMESPACES = {'mex': 'http://mcuxpresso.nxp.com/XSD/mex_configuration_14'}
 
 class MUXOption:
     """

mcux/scripts/pinctrl/shared/mex_utils.py

@@ -3,7 +3,7 @@
 """
 
 # MEX file has a default namespace, map it here
-NAMESPACES = {'mex' : 'http://mcuxpresso.nxp.com/XSD/mex_configuration_13'}
+NAMESPACES = {'mex' : 'http://mcuxpresso.nxp.com/XSD/mex_configuration_14'}
 
 import xml.etree.ElementTree as ET
 import logging
@@ -27,8 +27,11 @@ def get_pins_version(self):
         """
         try:
             config_tree = ET.parse(self.mexfile)
-            return float(config_tree.getroot().find('mex:tools/mex:pins',
-                NAMESPACES).get('version'))
+            pins_version = config_tree.getroot().find('mex:tools/mex:pins',
+                NAMESPACES)
+            if pins_version is None:
+                return 0.0
+            return float(pins_version.get('version'))
         except ET.ParseError:
             logging.error("Malformed XML tree %s", self.mexfile)
             return None