script: stm32variant: manage multiple SYS_WKUPx pins

SMT32U5xx have multiple SYS_WKUPx pins

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

Author: fpistm

CI/utils/stm32variant.py

@@ -1056,32 +1056,21 @@ def print_peripheral():
 
 # PinNamesVar.h generation
 def manage_syswkup():
-    syswkup_pins_list = []
+    syswkup_pins_list = [[] for _ in range(8)]
     if len(syswkup_list) != 0:
-        # H7xx and F446 start from 0, inc by 1
-        inc = 0
+        # H7xx and F446 start from 0
+        base_index = 1
         if syswkup_list[0][2].replace("SYS_WKUP", "") == "0":
-            inc = 1
-        # Fill list with missing SYS_WKUPx set to NC
-        i = 0
-        while i < 8:
-            num = 0
-            if len(syswkup_list) > i:
-                n = syswkup_list[i][2].replace("SYS_WKUP", "")
-                if len(n) != 0:
-                    num = int(n) if inc == 1 else int(n) - 1
-            x = i if inc == 1 else i + 1
-            if num != i:
-                syswkup_list.insert(i, ["NC", "NC_" + str(x), "SYS_WKUP" + str(x)])
-            i += 1
+            base_index = 0
         for p in syswkup_list:
             num = p[2].replace("SYS_WKUP", "")
-            if (inc == 1) and (p[0] != "NC"):
-                cmt = " /* " + p[2] + " */"
-            else:
+            num = int(num) if num else 1
+            if base_index == 1:
+                num -= 1
                 cmt = ""
-            syswkup_pins_list.append([p[0], cmt])
-
+            else:
+                cmt = " /* " + p[2] + " */"
+            syswkup_pins_list[num].append([p[0], cmt])
     return syswkup_pins_list
 
 
@@ -1127,6 +1116,12 @@ def print_pinamevar():
             usb_pins_list=sorted_usb_pins_list,
         )
     )
+    alt_syswkup_list = []
+    for idx, syswkup_list in enumerate(syswkup_pins_list, start=1):
+        if len(syswkup_list) > 1:
+            for idx2, lst in enumerate(syswkup_list[1:], start=1):
+                alt_syswkup_list.append("{}_{}".format(idx, idx2))
+    return alt_syswkup_list
 
 
 # Variant files generation
@@ -1253,7 +1248,7 @@ def timer_variant():
     return dict(tone=tone, servo=servo)
 
 
-def print_variant(generic_list):
+def print_variant(generic_list, alt_syswkup_list):
     variant_h_template = j2_env.get_template(variant_h_filename)
     variant_cpp_template = j2_env.get_template(variant_cpp_filename)
 
@@ -1344,6 +1339,7 @@ def print_variant(generic_list):
             year=datetime.datetime.now().year,
             pins_number_list=pins_number_list,
             alt_pins_list=alt_pins_list,
+            alt_syswkup_list=alt_syswkup_list,
             waltpin=max(waltpin),
             num_digital_pins=num_digital_pins,
             num_dualpad_pins=num_dualpad_pins,
@@ -2375,8 +2371,9 @@ def manage_repo():
     generic_list = print_boards_entry()
     print_general_clock(generic_list)
     print_peripheral()
-    print_pinamevar()
-    print_variant(generic_list)
+    alt_syswkup_list = print_pinamevar()
+    print_variant(generic_list, alt_syswkup_list)
+    del alt_syswkup_list[:]
     del generic_list[:]
     print(
         "* Total I/O pins found: {}".format(

CI/utils/templates/PinNamesVar.h

@@ -1,33 +1,42 @@
 {% if dualpad_pins_list %}
 /* Dual pad pin name */
-{% for dp in dualpad_pins_list %}
+  {% for dp in dualpad_pins_list %}
 {{"%s = %s | PDUAL,"|format(dp.name.ljust(waltpin), dp.base.ljust(waltpin-5))}}
-{% endfor %}
+  {% endfor %}
 
 {% endif %}
 {% if remap_pins_list %}
 /* Remap pin name */
-{% for dp in remap_pins_list %}
+  {% for dp in remap_pins_list %}
 {{"%s = %s | PREMAP,"|format(dp.name.ljust(waltpin), dp.base.ljust(waltpin-5))}}
-{% endfor %}
+  {% endfor %}
 
 {% endif %}
 {% if alt_pins_list %}
 /* Alternate pin name */
-{% for alt in alt_pins_list %}
+  {% for alt in alt_pins_list %}
 {{"%s = %s | %s,"|format(alt.name.ljust(waltpin), alt.base.ljust(waltpin-5), alt.num)}}
-{% endfor %}
+  {% endfor %}
 {% else %}
 /* No alternate */
 {% endif %}
 
 {% if syswkup_pins_list %}
 /* SYS_WKUP */
-{% for syswkup in syswkup_pins_list %}
+  {% for syswkup_list in syswkup_pins_list %}
+    {% set outer_loop = loop %}
+    {% if syswkup_list %}
+      {% for syswkup in syswkup_list %}
+#ifdef PWR_WAKEUP_PIN{{outer_loop.index}}
+  SYS_WKUP{{outer_loop.index}}{{"_{}".format(loop.index - 1) if loop.index > 1}} = {{syswkup[0]}},{{syswkup[1]}}
+#endif
+      {% endfor %}
+    {% else %}
 #ifdef PWR_WAKEUP_PIN{{loop.index}}
-  SYS_WKUP{{loop.index}} = {{syswkup[0]}},{{syswkup[1]}}
+  SYS_WKUP{{loop.index}} = NC,
 #endif
-{% endfor %}
+    {% endif %}
+  {% endfor %}
 {% else %}
 /* No SYS_WKUP */
 {% endif %}

CI/utils/templates/variant_generic.h

@@ -21,9 +21,9 @@
 {% if alt_pins_list %}
 
 // Alternate pins number
-{% for alt in alt_pins_list %}
+  {% for alt in alt_pins_list %}
 #define {{"%-23s (%s | %s)"|format(alt.name, alt.base.ljust(waltpin-5), alt.num)}}
-{% endfor %}
+  {% endfor %}
 {% endif %}
 
 #define NUM_DIGITAL_PINS        {{num_digital_pins}}
@@ -101,11 +101,18 @@
 
 {% if hal_modules_list %}
 // Extra HAL modules
-{% for hal_module in hal_modules_list %}
+  {% for hal_module in hal_modules_list %}
 #if !defined(HAL_{{hal_module}}_MODULE_DISABLED)
   #define HAL_{{hal_module}}_MODULE_ENABLED
 #endif
-{% endfor %}
+  {% endfor %}
+
+{% endif %}
+{% if alt_syswkup_list %}
+// Alternate SYS_WKUP definition
+  {% for def in alt_syswkup_list %}
+#define PWR_WAKEUP_PIN{{def}}
+  {% endfor %}
 
 {% endif %}
 /*----------------------------------------------------------------------------