Merge pull request stm32duino#2631 from fpistm/product_line

fix: wrong product lines
fpistm · Jan 14, 2025 · 417d8bd · 417d8bd
2 parents d8a8b20 + dfbd256
commit 417d8bd
Show file tree

Hide file tree

Showing 19 changed files with 99 additions and 86 deletions.
diff --git a/CI/update/stm32variant.py b/CI/update/stm32variant.py
@@ -1584,10 +1584,11 @@ def print_variant(generic_list, alt_syswkup_list):
     )
 
 
-def search_product_line(valueline):
+def search_product_line(valueline: str, extra: str) -> str:
     product_line = ""
+    product_line_list = product_line_dict[mcu_family]
     if not valueline.startswith("STM32MP1"):
-        for pline in product_line_dict[mcu_family]:
+        for idx_pline, pline in enumerate(product_line_list):
             vline = valueline
             product_line = pline
             # Remove the 'x' character from pline and
@@ -1600,6 +1601,10 @@ def search_product_line(valueline):
                 else:
                     break
             if pline >= vline:
+                if extra and len(product_line_list) > idx_pline + 1:
+                    if product_line_list[idx_pline + 1] == (product_line + extra):
+                        # Look for the next product line if contains the extra
+                        product_line = product_line_list[idx_pline + 1]
                 break
         else:
             # In case of CMSIS device does not exist
@@ -1698,11 +1703,14 @@ def print_boards_entry():
                 }
             )
         # Search product line for last flash size
+        # Keep the AQ if any
+        subp = pl_regex.search(subf.group(3))
         product_line = search_product_line(
             "STM32"
             + subf.group(1)
             + subf.group(2).split("-")[-1]
-            + package_regex.sub(r"", subf.group(3))
+            + package_regex.sub(r"", subf.group(3)),
+            subp.group(1) if subp and subp.group(1) is not None else "",
         )
     else:
         valueline = mcu_refname
@@ -1715,7 +1723,11 @@ def print_boards_entry():
                 "svd": search_svdfile(mcu_refname),
             }
         )
-        product_line = search_product_line(package_regex.sub(r"", valueline))
+        subp = pl_regex.search(valueline)
+        product_line = search_product_line(
+            package_regex.sub(r"", valueline),
+            subp.group(1) if subp and subp.group(1) is not None else "",
+        )
 
     gen_entry = mcu_family.replace("STM32", "Gen")
 
@@ -2685,6 +2697,7 @@ def manage_repo():
 # Clean temporary dir
 deleteFolder(tmp_dir)
 
+pl_regex = re.compile(r"([AQ])$")
 package_regex = re.compile(r"[\w][\w]([ANPQSXZ])?$")
 flash_group_regex = re.compile(r"(.*)\((.*)\)(.*)")
 

diff --git a/boards.txt b/boards.txt
@@ -10935,7 +10935,7 @@ GenL1.menu.pnum.GENERIC_L100C6UXA=Generic L100C6UxA
 GenL1.menu.pnum.GENERIC_L100C6UXA.upload.maximum_size=32768
 GenL1.menu.pnum.GENERIC_L100C6UXA.upload.maximum_data_size=10240
 GenL1.menu.pnum.GENERIC_L100C6UXA.build.board=GENERIC_L100C6UXA
-GenL1.menu.pnum.GENERIC_L100C6UXA.build.product_line=STM32L100xB
+GenL1.menu.pnum.GENERIC_L100C6UXA.build.product_line=STM32L100xBA
 GenL1.menu.pnum.GENERIC_L100C6UXA.build.variant=STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)
 GenL1.menu.pnum.GENERIC_L100C6UXA.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L1xx/STM32L100.svd
 
@@ -10971,7 +10971,7 @@ GenL1.menu.pnum.GENERIC_L151C6TXA=Generic L151C6TxA
 GenL1.menu.pnum.GENERIC_L151C6TXA.upload.maximum_size=32768
 GenL1.menu.pnum.GENERIC_L151C6TXA.upload.maximum_data_size=16384
 GenL1.menu.pnum.GENERIC_L151C6TXA.build.board=GENERIC_L151C6TXA
-GenL1.menu.pnum.GENERIC_L151C6TXA.build.product_line=STM32L151xB
+GenL1.menu.pnum.GENERIC_L151C6TXA.build.product_line=STM32L151xBA
 GenL1.menu.pnum.GENERIC_L151C6TXA.build.variant=STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)
 GenL1.menu.pnum.GENERIC_L151C6TXA.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L1xx/STM32L151.svd
 
@@ -10980,7 +10980,7 @@ GenL1.menu.pnum.GENERIC_L151C8TXA=Generic L151C8TxA
 GenL1.menu.pnum.GENERIC_L151C8TXA.upload.maximum_size=65536
 GenL1.menu.pnum.GENERIC_L151C8TXA.upload.maximum_data_size=32768
 GenL1.menu.pnum.GENERIC_L151C8TXA.build.board=GENERIC_L151C8TXA
-GenL1.menu.pnum.GENERIC_L151C8TXA.build.product_line=STM32L151xB
+GenL1.menu.pnum.GENERIC_L151C8TXA.build.product_line=STM32L151xBA
 GenL1.menu.pnum.GENERIC_L151C8TXA.build.variant=STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)
 GenL1.menu.pnum.GENERIC_L151C8TXA.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L1xx/STM32L151.svd
 
@@ -10989,7 +10989,7 @@ GenL1.menu.pnum.GENERIC_L151CBTXA=Generic L151CBTxA
 GenL1.menu.pnum.GENERIC_L151CBTXA.upload.maximum_size=131072
 GenL1.menu.pnum.GENERIC_L151CBTXA.upload.maximum_data_size=32768
 GenL1.menu.pnum.GENERIC_L151CBTXA.build.board=GENERIC_L151CBTXA
-GenL1.menu.pnum.GENERIC_L151CBTXA.build.product_line=STM32L151xB
+GenL1.menu.pnum.GENERIC_L151CBTXA.build.product_line=STM32L151xBA
 GenL1.menu.pnum.GENERIC_L151CBTXA.build.variant=STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)
 GenL1.menu.pnum.GENERIC_L151CBTXA.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L1xx/STM32L151.svd
 
@@ -11025,7 +11025,7 @@ GenL1.menu.pnum.GENERIC_L151C6UXA=Generic L151C6UxA
 GenL1.menu.pnum.GENERIC_L151C6UXA.upload.maximum_size=32768
 GenL1.menu.pnum.GENERIC_L151C6UXA.upload.maximum_data_size=16384
 GenL1.menu.pnum.GENERIC_L151C6UXA.build.board=GENERIC_L151C6UXA
-GenL1.menu.pnum.GENERIC_L151C6UXA.build.product_line=STM32L151xB
+GenL1.menu.pnum.GENERIC_L151C6UXA.build.product_line=STM32L151xBA
 GenL1.menu.pnum.GENERIC_L151C6UXA.build.variant=STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)
 GenL1.menu.pnum.GENERIC_L151C6UXA.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L1xx/STM32L151.svd
 
@@ -11034,7 +11034,7 @@ GenL1.menu.pnum.GENERIC_L151C8UXA=Generic L151C8UxA
 GenL1.menu.pnum.GENERIC_L151C8UXA.upload.maximum_size=65536
 GenL1.menu.pnum.GENERIC_L151C8UXA.upload.maximum_data_size=32768
 GenL1.menu.pnum.GENERIC_L151C8UXA.build.board=GENERIC_L151C8UXA
-GenL1.menu.pnum.GENERIC_L151C8UXA.build.product_line=STM32L151xB
+GenL1.menu.pnum.GENERIC_L151C8UXA.build.product_line=STM32L151xBA
 GenL1.menu.pnum.GENERIC_L151C8UXA.build.variant=STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)
 GenL1.menu.pnum.GENERIC_L151C8UXA.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L1xx/STM32L151.svd
 
@@ -11043,7 +11043,7 @@ GenL1.menu.pnum.GENERIC_L151CBUXA=Generic L151CBUxA
 GenL1.menu.pnum.GENERIC_L151CBUXA.upload.maximum_size=131072
 GenL1.menu.pnum.GENERIC_L151CBUXA.upload.maximum_data_size=32768
 GenL1.menu.pnum.GENERIC_L151CBUXA.build.board=GENERIC_L151CBUXA
-GenL1.menu.pnum.GENERIC_L151CBUXA.build.product_line=STM32L151xB
+GenL1.menu.pnum.GENERIC_L151CBUXA.build.product_line=STM32L151xBA
 GenL1.menu.pnum.GENERIC_L151CBUXA.build.variant=STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)
 GenL1.menu.pnum.GENERIC_L151CBUXA.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L1xx/STM32L151.svd
 
@@ -11088,7 +11088,7 @@ GenL1.menu.pnum.GENERIC_L152C6TXA=Generic L152C6TxA
 GenL1.menu.pnum.GENERIC_L152C6TXA.upload.maximum_size=32768
 GenL1.menu.pnum.GENERIC_L152C6TXA.upload.maximum_data_size=16384
 GenL1.menu.pnum.GENERIC_L152C6TXA.build.board=GENERIC_L152C6TXA
-GenL1.menu.pnum.GENERIC_L152C6TXA.build.product_line=STM32L152xB
+GenL1.menu.pnum.GENERIC_L152C6TXA.build.product_line=STM32L152xBA
 GenL1.menu.pnum.GENERIC_L152C6TXA.build.variant=STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)
 GenL1.menu.pnum.GENERIC_L152C6TXA.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L1xx/STM32L152.svd
 
@@ -11097,7 +11097,7 @@ GenL1.menu.pnum.GENERIC_L152C8TXA=Generic L152C8TxA
 GenL1.menu.pnum.GENERIC_L152C8TXA.upload.maximum_size=65536
 GenL1.menu.pnum.GENERIC_L152C8TXA.upload.maximum_data_size=32768
 GenL1.menu.pnum.GENERIC_L152C8TXA.build.board=GENERIC_L152C8TXA
-GenL1.menu.pnum.GENERIC_L152C8TXA.build.product_line=STM32L152xB
+GenL1.menu.pnum.GENERIC_L152C8TXA.build.product_line=STM32L152xBA
 GenL1.menu.pnum.GENERIC_L152C8TXA.build.variant=STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)
 GenL1.menu.pnum.GENERIC_L152C8TXA.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L1xx/STM32L152.svd
 
@@ -11106,7 +11106,7 @@ GenL1.menu.pnum.GENERIC_L152CBTXA=Generic L152CBTxA
 GenL1.menu.pnum.GENERIC_L152CBTXA.upload.maximum_size=131072
 GenL1.menu.pnum.GENERIC_L152CBTXA.upload.maximum_data_size=32768
 GenL1.menu.pnum.GENERIC_L152CBTXA.build.board=GENERIC_L152CBTXA
-GenL1.menu.pnum.GENERIC_L152CBTXA.build.product_line=STM32L152xB
+GenL1.menu.pnum.GENERIC_L152CBTXA.build.product_line=STM32L152xBA
 GenL1.menu.pnum.GENERIC_L152CBTXA.build.variant=STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)
 GenL1.menu.pnum.GENERIC_L152CBTXA.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L1xx/STM32L152.svd
 
@@ -11142,7 +11142,7 @@ GenL1.menu.pnum.GENERIC_L152C6UXA=Generic L152C6UxA
 GenL1.menu.pnum.GENERIC_L152C6UXA.upload.maximum_size=32768
 GenL1.menu.pnum.GENERIC_L152C6UXA.upload.maximum_data_size=16384
 GenL1.menu.pnum.GENERIC_L152C6UXA.build.board=GENERIC_L152C6UXA
-GenL1.menu.pnum.GENERIC_L152C6UXA.build.product_line=STM32L152xB
+GenL1.menu.pnum.GENERIC_L152C6UXA.build.product_line=STM32L152xBA
 GenL1.menu.pnum.GENERIC_L152C6UXA.build.variant=STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)
 GenL1.menu.pnum.GENERIC_L152C6UXA.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L1xx/STM32L152.svd
 
@@ -11151,7 +11151,7 @@ GenL1.menu.pnum.GENERIC_L152C8UXA=Generic L152C8UxA
 GenL1.menu.pnum.GENERIC_L152C8UXA.upload.maximum_size=65536
 GenL1.menu.pnum.GENERIC_L152C8UXA.upload.maximum_data_size=32768
 GenL1.menu.pnum.GENERIC_L152C8UXA.build.board=GENERIC_L152C8UXA
-GenL1.menu.pnum.GENERIC_L152C8UXA.build.product_line=STM32L152xB
+GenL1.menu.pnum.GENERIC_L152C8UXA.build.product_line=STM32L152xBA
 GenL1.menu.pnum.GENERIC_L152C8UXA.build.variant=STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)
 GenL1.menu.pnum.GENERIC_L152C8UXA.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L1xx/STM32L152.svd
 
@@ -11160,7 +11160,7 @@ GenL1.menu.pnum.GENERIC_L152CBUXA=Generic L152CBUxA
 GenL1.menu.pnum.GENERIC_L152CBUXA.upload.maximum_size=131072
 GenL1.menu.pnum.GENERIC_L152CBUXA.upload.maximum_data_size=32768
 GenL1.menu.pnum.GENERIC_L152CBUXA.build.board=GENERIC_L152CBUXA
-GenL1.menu.pnum.GENERIC_L152CBUXA.build.product_line=STM32L152xB
+GenL1.menu.pnum.GENERIC_L152CBUXA.build.product_line=STM32L152xBA
 GenL1.menu.pnum.GENERIC_L152CBUXA.build.variant=STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)
 GenL1.menu.pnum.GENERIC_L152CBUXA.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L1xx/STM32L152.svd
 

diff --git a/variants/STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI/boards_entry.txt b/variants/STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI/boards_entry.txt
@@ -26,7 +26,7 @@ GenH7.menu.pnum.GENERIC_H730ABIXQ=Generic H730ABIxQ
 GenH7.menu.pnum.GENERIC_H730ABIXQ.upload.maximum_size=131072
 GenH7.menu.pnum.GENERIC_H730ABIXQ.upload.maximum_data_size=577536
 GenH7.menu.pnum.GENERIC_H730ABIXQ.build.board=GENERIC_H730ABIXQ
-GenH7.menu.pnum.GENERIC_H730ABIXQ.build.product_line=STM32H730xx
+GenH7.menu.pnum.GENERIC_H730ABIXQ.build.product_line=STM32H730xxQ
 GenH7.menu.pnum.GENERIC_H730ABIXQ.build.variant=STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI
 GenH7.menu.pnum.GENERIC_H730ABIXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H730.svd
 

diff --git a/variants/STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK/boards_entry.txt b/variants/STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK/boards_entry.txt
@@ -26,7 +26,7 @@ GenH7.menu.pnum.GENERIC_H730IBKXQ=Generic H730IBKxQ
 GenH7.menu.pnum.GENERIC_H730IBKXQ.upload.maximum_size=131072
 GenH7.menu.pnum.GENERIC_H730IBKXQ.upload.maximum_data_size=577536
 GenH7.menu.pnum.GENERIC_H730IBKXQ.build.board=GENERIC_H730IBKXQ
-GenH7.menu.pnum.GENERIC_H730IBKXQ.build.product_line=STM32H730xx
+GenH7.menu.pnum.GENERIC_H730IBKXQ.build.product_line=STM32H730xxQ
 GenH7.menu.pnum.GENERIC_H730IBKXQ.build.variant=STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK
 GenH7.menu.pnum.GENERIC_H730IBKXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H730.svd
 

diff --git a/variants/STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT/boards_entry.txt b/variants/STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT/boards_entry.txt
@@ -26,7 +26,7 @@ GenH7.menu.pnum.GENERIC_H730IBTXQ=Generic H730IBTxQ
 GenH7.menu.pnum.GENERIC_H730IBTXQ.upload.maximum_size=131072
 GenH7.menu.pnum.GENERIC_H730IBTXQ.upload.maximum_data_size=577536
 GenH7.menu.pnum.GENERIC_H730IBTXQ.build.board=GENERIC_H730IBTXQ
-GenH7.menu.pnum.GENERIC_H730IBTXQ.build.product_line=STM32H730xx
+GenH7.menu.pnum.GENERIC_H730IBTXQ.build.product_line=STM32H730xxQ
 GenH7.menu.pnum.GENERIC_H730IBTXQ.build.variant=STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT
 GenH7.menu.pnum.GENERIC_H730IBTXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H730.svd
 

diff --git a/variants/STM32H7xx/H7A3A(G-I)IxQ_H7B0ABIxQ_H7B3AIIxQ/boards_entry.txt b/variants/STM32H7xx/H7A3A(G-I)IxQ_H7B0ABIxQ_H7B3AIIxQ/boards_entry.txt
@@ -8,7 +8,7 @@ GenH7.menu.pnum.GENERIC_H7A3AGIXQ=Generic H7A3AGIxQ
 GenH7.menu.pnum.GENERIC_H7A3AGIXQ.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H7A3AGIXQ.upload.maximum_data_size=1458176
 GenH7.menu.pnum.GENERIC_H7A3AGIXQ.build.board=GENERIC_H7A3AGIXQ
-GenH7.menu.pnum.GENERIC_H7A3AGIXQ.build.product_line=STM32H7A3xx
+GenH7.menu.pnum.GENERIC_H7A3AGIXQ.build.product_line=STM32H7A3xxQ
 GenH7.menu.pnum.GENERIC_H7A3AGIXQ.build.variant=STM32H7xx/H7A3A(G-I)IxQ_H7B0ABIxQ_H7B3AIIxQ
 GenH7.menu.pnum.GENERIC_H7A3AGIXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H7A3.svd
 
@@ -17,7 +17,7 @@ GenH7.menu.pnum.GENERIC_H7A3AIIXQ=Generic H7A3AIIxQ
 GenH7.menu.pnum.GENERIC_H7A3AIIXQ.upload.maximum_size=2097152
 GenH7.menu.pnum.GENERIC_H7A3AIIXQ.upload.maximum_data_size=1458176
 GenH7.menu.pnum.GENERIC_H7A3AIIXQ.build.board=GENERIC_H7A3AIIXQ
-GenH7.menu.pnum.GENERIC_H7A3AIIXQ.build.product_line=STM32H7A3xx
+GenH7.menu.pnum.GENERIC_H7A3AIIXQ.build.product_line=STM32H7A3xxQ
 GenH7.menu.pnum.GENERIC_H7A3AIIXQ.build.variant=STM32H7xx/H7A3A(G-I)IxQ_H7B0ABIxQ_H7B3AIIxQ
 GenH7.menu.pnum.GENERIC_H7A3AIIXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H7A3.svd
 
@@ -26,7 +26,7 @@ GenH7.menu.pnum.GENERIC_H7B0ABIXQ=Generic H7B0ABIxQ
 GenH7.menu.pnum.GENERIC_H7B0ABIXQ.upload.maximum_size=131072
 GenH7.menu.pnum.GENERIC_H7B0ABIXQ.upload.maximum_data_size=1458176
 GenH7.menu.pnum.GENERIC_H7B0ABIXQ.build.board=GENERIC_H7B0ABIXQ
-GenH7.menu.pnum.GENERIC_H7B0ABIXQ.build.product_line=STM32H7B0xx
+GenH7.menu.pnum.GENERIC_H7B0ABIXQ.build.product_line=STM32H7B0xxQ
 GenH7.menu.pnum.GENERIC_H7B0ABIXQ.build.variant=STM32H7xx/H7A3A(G-I)IxQ_H7B0ABIxQ_H7B3AIIxQ
 GenH7.menu.pnum.GENERIC_H7B0ABIXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H7B0.svd
 
@@ -35,7 +35,7 @@ GenH7.menu.pnum.GENERIC_H7B3AIIXQ=Generic H7B3AIIxQ
 GenH7.menu.pnum.GENERIC_H7B3AIIXQ.upload.maximum_size=2097152
 GenH7.menu.pnum.GENERIC_H7B3AIIXQ.upload.maximum_data_size=1458176
 GenH7.menu.pnum.GENERIC_H7B3AIIXQ.build.board=GENERIC_H7B3AIIXQ
-GenH7.menu.pnum.GENERIC_H7B3AIIXQ.build.product_line=STM32H7B3xx
+GenH7.menu.pnum.GENERIC_H7B3AIIXQ.build.product_line=STM32H7B3xxQ
 GenH7.menu.pnum.GENERIC_H7B3AIIXQ.build.variant=STM32H7xx/H7A3A(G-I)IxQ_H7B0ABIxQ_H7B3AIIxQ
 GenH7.menu.pnum.GENERIC_H7B3AIIXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H7B3.svd
 
diff --git a/variants/STM32H7xx/H7A3I(G-I)KxQ_H7B0IBKxQ_H7B3IIKxQ/boards_entry.txt b/variants/STM32H7xx/H7A3I(G-I)KxQ_H7B0IBKxQ_H7B3IIKxQ/boards_entry.txt
@@ -8,7 +8,7 @@ GenH7.menu.pnum.GENERIC_H7A3IGKXQ=Generic H7A3IGKxQ
 GenH7.menu.pnum.GENERIC_H7A3IGKXQ.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H7A3IGKXQ.upload.maximum_data_size=1458176
 GenH7.menu.pnum.GENERIC_H7A3IGKXQ.build.board=GENERIC_H7A3IGKXQ
-GenH7.menu.pnum.GENERIC_H7A3IGKXQ.build.product_line=STM32H7A3xx
+GenH7.menu.pnum.GENERIC_H7A3IGKXQ.build.product_line=STM32H7A3xxQ
 GenH7.menu.pnum.GENERIC_H7A3IGKXQ.build.variant=STM32H7xx/H7A3I(G-I)KxQ_H7B0IBKxQ_H7B3IIKxQ
 GenH7.menu.pnum.GENERIC_H7A3IGKXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H7A3.svd
 
@@ -17,7 +17,7 @@ GenH7.menu.pnum.GENERIC_H7A3IIKXQ=Generic H7A3IIKxQ
 GenH7.menu.pnum.GENERIC_H7A3IIKXQ.upload.maximum_size=2097152
 GenH7.menu.pnum.GENERIC_H7A3IIKXQ.upload.maximum_data_size=1458176
 GenH7.menu.pnum.GENERIC_H7A3IIKXQ.build.board=GENERIC_H7A3IIKXQ
-GenH7.menu.pnum.GENERIC_H7A3IIKXQ.build.product_line=STM32H7A3xx
+GenH7.menu.pnum.GENERIC_H7A3IIKXQ.build.product_line=STM32H7A3xxQ
 GenH7.menu.pnum.GENERIC_H7A3IIKXQ.build.variant=STM32H7xx/H7A3I(G-I)KxQ_H7B0IBKxQ_H7B3IIKxQ
 GenH7.menu.pnum.GENERIC_H7A3IIKXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H7A3.svd
 
@@ -26,7 +26,7 @@ GenH7.menu.pnum.GENERIC_H7B0IBKXQ=Generic H7B0IBKxQ
 GenH7.menu.pnum.GENERIC_H7B0IBKXQ.upload.maximum_size=131072
 GenH7.menu.pnum.GENERIC_H7B0IBKXQ.upload.maximum_data_size=1458176
 GenH7.menu.pnum.GENERIC_H7B0IBKXQ.build.board=GENERIC_H7B0IBKXQ
-GenH7.menu.pnum.GENERIC_H7B0IBKXQ.build.product_line=STM32H7B0xx
+GenH7.menu.pnum.GENERIC_H7B0IBKXQ.build.product_line=STM32H7B0xxQ
 GenH7.menu.pnum.GENERIC_H7B0IBKXQ.build.variant=STM32H7xx/H7A3I(G-I)KxQ_H7B0IBKxQ_H7B3IIKxQ
 GenH7.menu.pnum.GENERIC_H7B0IBKXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H7B0.svd
 
@@ -35,7 +35,7 @@ GenH7.menu.pnum.GENERIC_H7B3IIKXQ=Generic H7B3IIKxQ
 GenH7.menu.pnum.GENERIC_H7B3IIKXQ.upload.maximum_size=2097152
 GenH7.menu.pnum.GENERIC_H7B3IIKXQ.upload.maximum_data_size=1458176
 GenH7.menu.pnum.GENERIC_H7B3IIKXQ.build.board=GENERIC_H7B3IIKXQ
-GenH7.menu.pnum.GENERIC_H7B3IIKXQ.build.product_line=STM32H7B3xx
+GenH7.menu.pnum.GENERIC_H7B3IIKXQ.build.product_line=STM32H7B3xxQ
 GenH7.menu.pnum.GENERIC_H7B3IIKXQ.build.variant=STM32H7xx/H7A3I(G-I)KxQ_H7B0IBKxQ_H7B3IIKxQ
 GenH7.menu.pnum.GENERIC_H7B3IIKXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H7B3.svd
 
diff --git a/variants/STM32H7xx/H7A3I(G-I)TxQ_H7B3IITxQ/boards_entry.txt b/variants/STM32H7xx/H7A3I(G-I)TxQ_H7B3IITxQ/boards_entry.txt
@@ -8,7 +8,7 @@ GenH7.menu.pnum.GENERIC_H7A3IGTXQ=Generic H7A3IGTxQ
 GenH7.menu.pnum.GENERIC_H7A3IGTXQ.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H7A3IGTXQ.upload.maximum_data_size=1458176
 GenH7.menu.pnum.GENERIC_H7A3IGTXQ.build.board=GENERIC_H7A3IGTXQ
-GenH7.menu.pnum.GENERIC_H7A3IGTXQ.build.product_line=STM32H7A3xx
+GenH7.menu.pnum.GENERIC_H7A3IGTXQ.build.product_line=STM32H7A3xxQ
 GenH7.menu.pnum.GENERIC_H7A3IGTXQ.build.variant=STM32H7xx/H7A3I(G-I)TxQ_H7B3IITxQ
 GenH7.menu.pnum.GENERIC_H7A3IGTXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H7A3.svd
 
@@ -17,7 +17,7 @@ GenH7.menu.pnum.GENERIC_H7A3IITXQ=Generic H7A3IITxQ
 GenH7.menu.pnum.GENERIC_H7A3IITXQ.upload.maximum_size=2097152
 GenH7.menu.pnum.GENERIC_H7A3IITXQ.upload.maximum_data_size=1458176
 GenH7.menu.pnum.GENERIC_H7A3IITXQ.build.board=GENERIC_H7A3IITXQ
-GenH7.menu.pnum.GENERIC_H7A3IITXQ.build.product_line=STM32H7A3xx
+GenH7.menu.pnum.GENERIC_H7A3IITXQ.build.product_line=STM32H7A3xxQ
 GenH7.menu.pnum.GENERIC_H7A3IITXQ.build.variant=STM32H7xx/H7A3I(G-I)TxQ_H7B3IITxQ
 GenH7.menu.pnum.GENERIC_H7A3IITXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H7A3.svd
 
@@ -26,7 +26,7 @@ GenH7.menu.pnum.GENERIC_H7B3IITXQ=Generic H7B3IITxQ
 GenH7.menu.pnum.GENERIC_H7B3IITXQ.upload.maximum_size=2097152
 GenH7.menu.pnum.GENERIC_H7B3IITXQ.upload.maximum_data_size=1458176
 GenH7.menu.pnum.GENERIC_H7B3IITXQ.build.board=GENERIC_H7B3IITXQ
-GenH7.menu.pnum.GENERIC_H7B3IITXQ.build.product_line=STM32H7B3xx
+GenH7.menu.pnum.GENERIC_H7B3IITXQ.build.product_line=STM32H7B3xxQ
 GenH7.menu.pnum.GENERIC_H7B3IITXQ.build.variant=STM32H7xx/H7A3I(G-I)TxQ_H7B3IITxQ
 GenH7.menu.pnum.GENERIC_H7B3IITXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H7B3.svd