Use Mcu description

This allows to harden the code as some mcu file name
is not enough to define the family, ex:
STM32GBK1CBTx is a STM32G4

Signed-off-by: Frederic Pillon <[email protected]>

Author: fpistm

CI/utils/stm32variant.py

@@ -47,6 +47,7 @@
 gpiofile = ""
 tim_inst_list = []  # TIMx instance
 usb_inst = {"usb": "", "otg_fs": "", "otg_hs": ""}
+mcu_family = ""
 
 # format
 # Peripheral
@@ -60,6 +61,7 @@
 # mcu file parsing
 def parse_IP_file():
     global gpiofile
+    global mcu_family
     tim_regex = r"^(TIM\d+)$"
     usb_regex = r"^(USB(?!PD|_HOST|_DEVICE).*)$"
     gpiofile = ""
@@ -68,6 +70,9 @@ def parse_IP_file():
     usb_inst["otg_fs"] = ""
     usb_inst["otg_hs"] = ""
 
+    mcu_node = xml_mcu.getElementsByTagName("Mcu")[0]
+    mcu_family = mcu_node.attributes["Family"].value
+
     itemlist = xml_mcu.getElementsByTagName("IP")
     for s in itemlist:
         inst = re.match(tim_regex, s.attributes["InstanceName"].value)
@@ -1679,10 +1684,16 @@ def manage_repo():
 
 for mcu_file in mcu_list:
     print("Generating files for '{}'...".format(mcu_file.name))
-    if "MP1" in mcu_file.name:
-        mcu_dir = "STM32MP1xx"
-    else:
-        mcu_dir = mcu_file.name[:7] + "xx"
+
+    # Open input file
+    xml_mcu = parse(str(mcu_file))
+    parse_IP_file()
+    if not gpiofile:
+        print("Could not find GPIO file")
+        quit()
+    xml_gpio = parse(str(dirIP / ("GPIO-" + gpiofile + "_Modes.xml")))
+
+    mcu_dir = mcu_family + "xx"
     out_path = root_dir / "variants" / mcu_dir / mcu_file.stem
     periph_c_filepath = out_path / periph_c_filename
     pinvar_h_filepath = out_path / pinvar_h_filename
@@ -1705,14 +1716,6 @@ def manage_repo():
         variant_h_filepath.unlink()
     variant_h_file = open(variant_h_filepath, "w", newline="\n")
 
-    # open input file
-    xml_mcu = parse(str(mcu_file))
-    parse_IP_file()
-    if not gpiofile:
-        print("Could not find GPIO file")
-        quit()
-    xml_gpio = parse(str(dirIP / ("GPIO-" + gpiofile + "_Modes.xml")))
-
     parse_pins()
     sort_my_lists()
     manage_alternate()