tools: Pass part number and revision in command line args.

Signed-off-by: iabdalkader <[email protected]>

Author: iabdalkader

toolkit/app-write-mram.py

@@ -196,15 +196,18 @@ def main():
     parser.add_argument(
         "-V", "--version", help="Display Version Number", action="store_true"
     )
+    parser.add_argument("--part", type=str, help="Part Number")
+    parser.add_argument("--rev", type=str, help="Part Revision")
+    parser.add_argument("--jtag", type=str, help="JTAG Interface", default="J-Link")
+    parser.add_argument("--mram", type=str, help="MRAM Interface", default="isp")
     parser.add_argument("-v", "--verbose", help="verbosity mode", action="store_true")
-
     args = parser.parse_args()
     if args.version:
         print(TOOL_VERSION)
         sys.exit()
 
     # memory defines for Alif/OEM MRAM Addresses and Sizes
-    load_global_config()
+    load_global_config(args.part, args.rev, args.jtag, args.mram)
     DEVICE_PART_NUMBER = utils.config.DEVICE_PART_NUMBER
     DEVICE_REVISION = utils.config.DEVICE_REVISION
     DEVICE_REV_BAUD_RATE = utils.config.DEVICE_REV_BAUD_RATE

toolkit/maintenance.py

@@ -742,14 +742,18 @@ def main():
     parser.add_argument(
         "-V", "--version", help="Display Version Number", action="store_true"
     )
+    parser.add_argument("--part", type=str, help="Part Number")
+    parser.add_argument("--rev", type=str, help="Part Revision")
+    parser.add_argument("--jtag", type=str, help="JTAG Interface", default="J-Link")
+    parser.add_argument("--mram", type=str, help="MRAM Interface", default="isp")
     parser.add_argument("-v", "--verbose", help="verbosity mode", action="store_true")
     args = parser.parse_args()
     if args.version:
         print(TOOL_VERSION)
         sys.exit()
 
     # memory defines for Alif/OEM MRAM Addresses and Sizes
-    load_global_config()
+    load_global_config(args.part, args.rev, args.jtag, args.mram)
     ALIF_BASE_ADDRESS = utils.config.ALIF_BASE_ADDRESS
     OEM_BASE_ADDRESS = utils.config.APP_BASE_ADDRESS
     OEM_MRAM_SIZE = utils.config.APP_MRAM_SIZE

toolkit/updateSystemPackage.py

@@ -112,14 +112,18 @@ def main():
     parser.add_argument(
         "-V", "--version", help="Display Version Number", action="store_true"
     )
+    parser.add_argument("--part", type=str, help="Part Number")
+    parser.add_argument("--rev", type=str, help="Part Revision")
+    parser.add_argument("--jtag", type=str, help="JTAG Interface", default="J-Link")
+    parser.add_argument("--mram", type=str, help="MRAM Interface", default="isp")
     parser.add_argument("-v", "--verbose", help="verbosity mode", action="store_true")
     args = parser.parse_args()
     if args.version:
         print(TOOL_VERSION)
         sys.exit()
 
     # retrieve initial params based on user selection (toold-config)
-    load_global_config()
+    load_global_config(args.part, args.rev, args.jtag, args.mram)
     DEVICE_PART_NUMBER = utils.config.DEVICE_PART_NUMBER
     DEVICE_REVISION = utils.config.DEVICE_REVISION
     DEVICE_REV_BAUD_RATE = utils.config.DEVICE_REV_BAUD_RATE

toolkit/utils/config.py

@@ -177,33 +177,37 @@ def load_device_config(devDescription, devRevision):
     APP_MRAM_SIZE = app_size
 
 
-def load_global_config():
+def load_global_config(part_num=None, part_rev=None, jtag_iface=None, mram_iface=None):
     global DEVICE_PART_NUMBER
     global DEVICE_REVISION
     global MRAM_BURN_INTERFACE
     global JTAG_ADAPTER
     global HASHES_DB
 
-    cfg = read_global_config(CONFIG_FILE)
+    if part_num:
+        DEVICE_PART_NUMBER = getPartDescription(part_num)
+        DEVICE_REVISION = part_rev
+        MRAM_BURN_INTERFACE = mram_iface
+        JTAG_ADAPTER = jtag_iface
+    else:
+        # load from config file.
+        cfg = read_global_config(CONFIG_FILE)
 
-    # validate configuration parameters
-    # check parameter is configured...
-    checkAttribute(cfg["DEVICE"], "Revision")
+        # validate configuration parameters
+        # check parameter is configured...
+        checkAttribute(cfg["DEVICE"], "Revision")
 
-    # read hashes DB
-    hashes = read_global_config(HASHES_DB_FILE)
+        DEVICE_PART_NUMBER = cfg["DEVICE"]["Part#"]
+        DEVICE_REVISION = cfg["DEVICE"]["Revision"]
 
-    DEVICE_PART_NUMBER = cfg["DEVICE"]["Part#"]
-    DEVICE_REVISION = cfg["DEVICE"]["Revision"]
+        # read hashes DB
+        HASHES_DB = read_global_config(HASHES_DB_FILE)
 
-    # load rest of config params
-    load_device_config(DEVICE_PART_NUMBER, DEVICE_REVISION)
-
-    # retrieve DEV Environments
-    HASHES_DB = hashes
+        # set MRAM BURNER Access Interface
+        MRAM_BURN_INTERFACE = cfg["MRAM-BURNER"]["Interface"]
 
-    # set MRAM BURNER Access Interface
-    MRAM_BURN_INTERFACE = cfg["MRAM-BURNER"]["Interface"]
+        # set JTAG Adapter
+        JTAG_ADAPTER = cfg["MRAM-BURNER"]["Jtag-adapter"]
 
-    # set JTAG Adapter
-    JTAG_ADAPTER = cfg["MRAM-BURNER"]["Jtag-adapter"]
+    # load rest of config params
+    load_device_config(DEVICE_PART_NUMBER, DEVICE_REVISION)