ci(stm32variant): enhance series managements

- dynamically manage ignores series
(i.e. the one not supported by the core)
- allow to update one or several series based on a pattern.

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>

Author: fpistm

CI/update/stm32variant.py

@@ -14,8 +14,17 @@
 
 script_path = Path(__file__).parent.resolve()
 sys.path.append(str(script_path.parent))
-from utils import defaultConfig, deleteFolder, execute_cmd, getRepoBranchName
+from utils import (
+    defaultConfig,
+    deleteFolder,
+    execute_cmd,
+    getRepoBranchName,
+    genSTM32List,
+)
 
+stm32_list = []  # series
+ignored_stm32_list = []  # series
+aggregate_serie_list = []  # series
 mcu_list = []  # 'name'
 io_list = []  # 'PIN','name'
 alt_list = []  # 'PIN','name'
@@ -158,6 +167,12 @@ def parse_mcu_file():
 
     mcu_node = xml_mcu.getElementsByTagName("Mcu")[0]
     mcu_family = mcu_node.attributes["Family"].value
+    # Check if FwLibrary is present in the attributes
+    if "FwLibrary" in mcu_node.attributes:
+        mcu_family = mcu_node.attributes["FwLibrary"].value
+        # split using '_' and kept the lasy part
+        mcu_family = f"STM32{mcu_family.split('_')[-1]}"
+
     if mcu_family.endswith("+"):
         mcu_family = mcu_family[:-1]
     mcu_refname = mcu_node.attributes["RefName"].value
@@ -2271,17 +2286,14 @@ def merge_dir(out_temp_path, group_mcu_dir, mcu_family, periph_xml, variant_exp)
 def aggregate_dir():
     # Get mcu_family directories
     out_temp_path = tmp_dir
-    mcu_families = sorted(out_temp_path.glob("STM32*/"))
 
     group_mcu_dir = []
     mcu_dir1_files_list = []
     mcu_dir2_files_list = []
 
     # Compare per family
-    for mcu_family in mcu_families:
-        # Generate only for one family
-        if filtered_family and filtered_family not in mcu_family.name:
-            continue
+    for mcu_family_name in aggregate_serie_list:
+        mcu_family = out_temp_path / f"{mcu_family_name}xx"
         out_family_path = root_dir / "variants" / mcu_family.name
         # Get all mcu_dir
         mcu_dirs = sorted(mcu_family.glob("*/"))
@@ -2525,14 +2537,7 @@ def manage_repo():
 system_path = root_dir / "system"
 templates_dir = script_path / "templates"
 mcu_family_dir = ""
-filtered_family = ""
-refname_filter = [
-    "STM32H7R",
-    "STM32H7S",
-    "STM32MP13",
-    "STM32MP2",
-    "STM32WB0",
-]
+filtered_serie = ""
 periph_c_filename = "PeripheralPins.c"
 pinvar_h_filename = "PinNamesVar.h"
 config_filename = script_path / "update_config.json"
@@ -2582,15 +2587,15 @@ def manage_repo():
 group.add_argument(
     "-l",
     "--list",
-    help="list available xml files description in database",
+    help="list available xml files description in database.",
     action="store_true",
 )
 
 group.add_argument(
-    "-f",
-    "--family",
-    metavar="name",
-    help="Generate all files for specified mcu family.",
+    "-s",
+    "--serie",
+    metavar="pattern",
+    help="Generate all files for specified STM32 serie(s) pattern.",
 )
 
 parser.add_argument(
@@ -2604,7 +2609,6 @@ def manage_repo():
     action="store_true",
 )
 parser.add_argument(
-    "-s",
     "--skip",
     help=f"Skip {repo_name} clone/fetch",
     action="store_true",
@@ -2656,13 +2660,9 @@ def manage_repo():
     print(f"{stm32targets_file} does not exits!")
     exit(1)
 
-if args.family:
-    filtered_family = args.family.upper()
-    filtered_family = filtered_family.removeprefix("STM32")
-    while filtered_family.endswith("X"):
-        filtered_family = filtered_family.rstrip("X")
-    filtered_family = f"STM32{filtered_family}"
-
+if args.serie:
+    serie = args.serie.upper()
+    serie_pattern = re.compile(rf"STM32({serie})$", re.IGNORECASE)
 # Get all xml files
 mcu_list = sorted(dirMCU.glob("STM32*.xml"))
 
@@ -2672,6 +2672,11 @@ def manage_repo():
         print(f.name)
     quit()
 
+stm32_list = [f"STM32{stm32}" for stm32 in genSTM32List(system_path / "Drivers")]
+if not stm32_list:
+    print(f"No STM32 series found in {system_path}/Drivers")
+    quit()
+
 # Create the jinja2 environment.
 j2_env = Environment(
     loader=FileSystemLoader(str(templates_dir)), trim_blocks=True, lstrip_blocks=True
@@ -2687,23 +2692,22 @@ def manage_repo():
     # Open input file
     xml_mcu = parse(str(mcu_file))
     parse_mcu_file()
-
-    # Generate only for one family or supported reference
+    # Generate only for specified pattern series or supported one
+    # Check if mcu_family is supported by the core
     if (
-        filtered_family
-        and filtered_family not in mcu_family
-        or any(skp in mcu_refname for skp in refname_filter)
+        mcu_family not in stm32_list
+        or args.serie
+        and serie_pattern.search(mcu_family) is None
     ):
-        # Add a warning if filtered family is requested
-        if filtered_family and filtered_family not in refname_filter:
-            for skp in refname_filter:
-                if skp == filtered_family:
-                    print(f"Requested family {filtered_family} is filtered!")
-                    print("Please update the refname_filter list.")
-                    quit()
+        if mcu_family not in ignored_stm32_list and mcu_family not in stm32_list:
+            ignored_stm32_list.append(mcu_family)
         xml_mcu.unlink()
         continue
 
+    # Add mcu family to the list of directory to aggregate
+    if mcu_family not in aggregate_serie_list:
+        aggregate_serie_list.append(mcu_family)
+
     print(f"Generating files for '{mcu_file.name}'...")
     if not gpiofile:
         print("Could not find GPIO file")
@@ -2771,3 +2775,10 @@ def manage_repo():
 
 # Clean temporary dir
 deleteFolder(tmp_dir)
+
+# Display ignored families
+if ignored_stm32_list:
+    print("\nIgnored families:")
+    for family in ignored_stm32_list:
+        print(f"  - {family}")
+    print("To be supported, series must first be supported by the core.")