From 354d8ed6f64ef40af79479fc04e1c1432461d14c Mon Sep 17 00:00:00 2001
From: jackb60 <40903548+jackb60@users.noreply.github.com>
Date: Sun, 2 Feb 2025 19:50:11 -0500
Subject: [PATCH 01/10] Add STM32F042K6U6 Support

Signed-off-by: jackb60 <40903548+jackb60@users.noreply.github.com>
---
 boards.txt | 1509 ++++++++--------------------------------------------
 1 file changed, 228 insertions(+), 1281 deletions(-)

diff --git a/boards.txt b/boards.txt
index 0aee1594ac..9ec4073203 100644
--- a/boards.txt
+++ b/boards.txt
@@ -52,7 +52,7 @@ Nucleo_144.menu.pnum.NUCLEO_F207ZG.build.series=STM32F2xx
 Nucleo_144.menu.pnum.NUCLEO_F207ZG.build.product_line=STM32F207xx
 Nucleo_144.menu.pnum.NUCLEO_F207ZG.build.variant=STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T
 Nucleo_144.menu.pnum.NUCLEO_F207ZG.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Nucleo_144.menu.pnum.NUCLEO_F207ZG.openocd.target=stm32f2x
+Nucleo_144.menu.pnum.NUCLEO_F207ZG.debug.server.openocd.scripts.2=target/stm32f2x.cfg
 Nucleo_144.menu.pnum.NUCLEO_F207ZG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
 
 # NUCLEO_F412ZG board
@@ -67,7 +67,7 @@ Nucleo_144.menu.pnum.NUCLEO_F412ZG.build.board=NUCLEO_F412ZG
 Nucleo_144.menu.pnum.NUCLEO_F412ZG.build.series=STM32F4xx
 Nucleo_144.menu.pnum.NUCLEO_F412ZG.build.product_line=STM32F412Zx
 Nucleo_144.menu.pnum.NUCLEO_F412ZG.build.variant=STM32F4xx/F412Z(E-G)(J-T)
-Nucleo_144.menu.pnum.NUCLEO_F412ZG.openocd.target=stm32f4x
+Nucleo_144.menu.pnum.NUCLEO_F412ZG.debug.server.openocd.scripts.2=target/stm32f4x.cfg
 Nucleo_144.menu.pnum.NUCLEO_F412ZG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F412.svd
 
 # NUCLEO_F413ZH board
@@ -82,7 +82,7 @@ Nucleo_144.menu.pnum.NUCLEO_F413ZH.build.board=NUCLEO_F413ZH
 Nucleo_144.menu.pnum.NUCLEO_F413ZH.build.series=STM32F4xx
 Nucleo_144.menu.pnum.NUCLEO_F413ZH.build.product_line=STM32F413xx
 Nucleo_144.menu.pnum.NUCLEO_F413ZH.build.variant=STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)
-Nucleo_144.menu.pnum.NUCLEO_F413ZH.openocd.target=stm32f4x
+Nucleo_144.menu.pnum.NUCLEO_F413ZH.debug.server.openocd.scripts.2=target/stm32f4x.cfg
 Nucleo_144.menu.pnum.NUCLEO_F413ZH.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F413.svd
 
 # NUCLEO_F429ZI board
@@ -99,8 +99,7 @@ Nucleo_144.menu.pnum.NUCLEO_F429ZI.build.series=STM32F4xx
 Nucleo_144.menu.pnum.NUCLEO_F429ZI.build.product_line=STM32F429xx
 Nucleo_144.menu.pnum.NUCLEO_F429ZI.build.variant=STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)
 Nucleo_144.menu.pnum.NUCLEO_F429ZI.build.variant_h=variant_NUCLEO_F4x9ZI.h
-Nucleo_144.menu.pnum.NUCLEO_F429ZI.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Nucleo_144.menu.pnum.NUCLEO_F429ZI.openocd.target=stm32f4x
+Nucleo_144.menu.pnum.NUCLEO_F429ZI.debug.server.openocd.scripts.2=target/stm32f4x.cfg
 Nucleo_144.menu.pnum.NUCLEO_F429ZI.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F429.svd
 
 # NUCLEO_F439ZI board
@@ -116,8 +115,7 @@ Nucleo_144.menu.pnum.NUCLEO_F439ZI.build.series=STM32F4xx
 Nucleo_144.menu.pnum.NUCLEO_F439ZI.build.product_line=STM32F439xx
 Nucleo_144.menu.pnum.NUCLEO_F439ZI.build.variant=STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)
 Nucleo_144.menu.pnum.NUCLEO_F439ZI.build.variant_h=variant_NUCLEO_F4x9ZI.h
-Nucleo_144.menu.pnum.NUCLEO_F439ZI.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Nucleo_144.menu.pnum.NUCLEO_F439ZI.openocd.target=stm32f4x
+Nucleo_144.menu.pnum.NUCLEO_F439ZI.debug.server.openocd.scripts.2=target/stm32f4x.cfg
 Nucleo_144.menu.pnum.NUCLEO_F439ZI.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F439.svd
 
 # NUCLEO_F446RE board
@@ -132,7 +130,7 @@ Nucleo_144.menu.pnum.NUCLEO_F446ZE.build.board=NUCLEO_F446ZE
 Nucleo_144.menu.pnum.NUCLEO_F446ZE.build.series=STM32F4xx
 Nucleo_144.menu.pnum.NUCLEO_F446ZE.build.product_line=STM32F446xx
 Nucleo_144.menu.pnum.NUCLEO_F446ZE.build.variant=STM32F4xx/F446Z(C-E)(H-J-T)
-Nucleo_144.menu.pnum.NUCLEO_F446ZE.openocd.target=stm32f4x
+Nucleo_144.menu.pnum.NUCLEO_F446ZE.debug.server.openocd.scripts.2=target/stm32f4x.cfg
 Nucleo_144.menu.pnum.NUCLEO_F446ZE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F446.svd
 
 # NUCLEO_F722ZE board
@@ -147,7 +145,7 @@ Nucleo_144.menu.pnum.NUCLEO_F722ZE.build.series=STM32F7xx
 Nucleo_144.menu.pnum.NUCLEO_F722ZE.build.product_line=STM32F722xx
 Nucleo_144.menu.pnum.NUCLEO_F722ZE.build.variant=STM32F7xx/F722Z(C-E)T_F732ZET
 Nucleo_144.menu.pnum.NUCLEO_F722ZE.build.variant_h=variant_NUCLEO_F722ZE.h
-Nucleo_144.menu.pnum.NUCLEO_F722ZE.openocd.target=stm32f7x
+Nucleo_144.menu.pnum.NUCLEO_F722ZE.debug.server.openocd.scripts.2=target/stm32f7x.cfg
 Nucleo_144.menu.pnum.NUCLEO_F722ZE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F7xx/STM32F722.svd
 
 # NUCLEO_F746ZG board
@@ -163,7 +161,7 @@ Nucleo_144.menu.pnum.NUCLEO_F746ZG.build.series=STM32F7xx
 Nucleo_144.menu.pnum.NUCLEO_F746ZG.build.product_line=STM32F746xx
 Nucleo_144.menu.pnum.NUCLEO_F746ZG.build.variant=STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)
 Nucleo_144.menu.pnum.NUCLEO_F746ZG.build.variant_h=variant_NUCLEO_F7x6ZG.h
-Nucleo_144.menu.pnum.NUCLEO_F746ZG.openocd.target=stm32f7x
+Nucleo_144.menu.pnum.NUCLEO_F746ZG.debug.server.openocd.scripts.2=target/stm32f7x.cfg
 Nucleo_144.menu.pnum.NUCLEO_F746ZG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F7xx/STM32F746.svd
 
 # NUCLEO_F756ZG board
@@ -179,7 +177,7 @@ Nucleo_144.menu.pnum.NUCLEO_F756ZG.build.series=STM32F7xx
 Nucleo_144.menu.pnum.NUCLEO_F756ZG.build.product_line=STM32F756xx
 Nucleo_144.menu.pnum.NUCLEO_F756ZG.build.variant=STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)
 Nucleo_144.menu.pnum.NUCLEO_F756ZG.build.variant_h=variant_NUCLEO_F7x6ZG.h
-Nucleo_144.menu.pnum.NUCLEO_F756ZG.openocd.target=stm32f7x
+Nucleo_144.menu.pnum.NUCLEO_F756ZG.debug.server.openocd.scripts.2=target/stm32f7x.cfg
 Nucleo_144.menu.pnum.NUCLEO_F756ZG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F7xx/STM32F756.svd
 
 # NUCLEO_F767ZI board
@@ -194,7 +192,7 @@ Nucleo_144.menu.pnum.NUCLEO_F767ZI.build.board=NUCLEO_F767ZI
 Nucleo_144.menu.pnum.NUCLEO_F767ZI.build.series=STM32F7xx
 Nucleo_144.menu.pnum.NUCLEO_F767ZI.build.product_line=STM32F767xx
 Nucleo_144.menu.pnum.NUCLEO_F767ZI.build.variant=STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT
-Nucleo_144.menu.pnum.NUCLEO_F767ZI.openocd.target=stm32f7x
+Nucleo_144.menu.pnum.NUCLEO_F767ZI.debug.server.openocd.scripts.2=target/stm32f7x.cfg
 Nucleo_144.menu.pnum.NUCLEO_F767ZI.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F7xx/STM32F767.svd
 
 # NUCLEO H563ZI
@@ -209,7 +207,7 @@ Nucleo_144.menu.pnum.NUCLEO_H563ZI.build.board=NUCLEO_H563ZI
 Nucleo_144.menu.pnum.NUCLEO_H563ZI.build.series=STM32H5xx
 Nucleo_144.menu.pnum.NUCLEO_H563ZI.build.product_line=STM32H563xx
 Nucleo_144.menu.pnum.NUCLEO_H563ZI.build.variant=STM32H5xx/H563Z(G-I)T_H573ZIT
-Nucleo_144.menu.pnum.NUCLEO_H563ZI.openocd.target=stm32h5x
+Nucleo_144.menu.pnum.NUCLEO_H563ZI.debug.server.openocd.scripts.2=target/stm32h5x.cfg
 Nucleo_144.menu.pnum.NUCLEO_H563ZI.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H5xx/STM32H563.svd
 
 # NUCLEO H723ZG board
@@ -224,7 +222,7 @@ Nucleo_144.menu.pnum.NUCLEO_H723ZG.build.board=NUCLEO_H723ZG
 Nucleo_144.menu.pnum.NUCLEO_H723ZG.build.series=STM32H7xx
 Nucleo_144.menu.pnum.NUCLEO_H723ZG.build.product_line=STM32H723xx
 Nucleo_144.menu.pnum.NUCLEO_H723ZG.build.variant=STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT
-Nucleo_144.menu.pnum.NUCLEO_H723ZG.openocd.target=stm32h7x
+Nucleo_144.menu.pnum.NUCLEO_H723ZG.debug.server.openocd.scripts.2=target/stm32h7x.cfg
 Nucleo_144.menu.pnum.NUCLEO_H723ZG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H723.svd
 
 # NUCLEO_H743ZI board
@@ -239,7 +237,7 @@ Nucleo_144.menu.pnum.NUCLEO_H743ZI.build.board=NUCLEO_H743ZI
 Nucleo_144.menu.pnum.NUCLEO_H743ZI.build.series=STM32H7xx
 Nucleo_144.menu.pnum.NUCLEO_H743ZI.build.product_line=STM32H743xx
 Nucleo_144.menu.pnum.NUCLEO_H743ZI.build.variant=STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT
-Nucleo_144.menu.pnum.NUCLEO_H743ZI.openocd.target=stm32h7x
+Nucleo_144.menu.pnum.NUCLEO_H743ZI.debug.server.openocd.scripts.2=target/stm32h7x.cfg
 Nucleo_144.menu.pnum.NUCLEO_H743ZI.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H743.svd
 
 Nucleo_144.menu.pnum.NUCLEO_H743ZI2=Nucleo H743ZI2
@@ -254,7 +252,7 @@ Nucleo_144.menu.pnum.NUCLEO_H743ZI2.build.series=STM32H7xx
 Nucleo_144.menu.pnum.NUCLEO_H743ZI2.build.product_line=STM32H743xx
 Nucleo_144.menu.pnum.NUCLEO_H743ZI2.build.variant=STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT
 Nucleo_144.menu.pnum.NUCLEO_H743ZI2.build.variant_h=variant_NUCLEO_H743ZI.h
-Nucleo_144.menu.pnum.NUCLEO_H743ZI2.openocd.target=stm32h7x
+Nucleo_144.menu.pnum.NUCLEO_H743ZI2.debug.server.openocd.scripts.2=target/stm32h7x.cfg
 Nucleo_144.menu.pnum.NUCLEO_H743ZI2.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H743.svd
 
 # NUCLEO_H753ZI board
@@ -270,25 +268,9 @@ Nucleo_144.menu.pnum.NUCLEO_H753ZI.build.series=STM32H7xx
 Nucleo_144.menu.pnum.NUCLEO_H753ZI.build.product_line=STM32H753xx
 Nucleo_144.menu.pnum.NUCLEO_H753ZI.build.variant=STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT
 Nucleo_144.menu.pnum.NUCLEO_H753ZI.build.variant_h=variant_NUCLEO_H753ZI.h
-Nucleo_144.menu.pnum.NUCLEO_H753ZI.openocd.target=stm32h7x
+Nucleo_144.menu.pnum.NUCLEO_H753ZI.debug.server.openocd.scripts.2=target/stm32h7x.cfg
 Nucleo_144.menu.pnum.NUCLEO_H753ZI.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H753.svd
 
-# NUCLEO_H7A3ZI_Q
-Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q=Nucleo H7A3ZI-Q
-Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.node=NOD_H7A3ZIQ
-Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.upload.maximum_size=2097152
-Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.upload.maximum_data_size=1048576
-Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.build.mcu=cortex-m7
-Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.build.fpu=-mfpu=fpv4-sp-d16
-Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.build.float-abi=-mfloat-abi=hard
-Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.build.board=NUCLEO_H7A3ZI_Q
-Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.build.series=STM32H7xx
-Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.build.product_line=STM32H7A3xxQ
-Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.build.variant=STM32H7xx/H7A3Z(G-I)TxQ_H7B3ZITxQ
-Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.build.variant_h=variant_NUCLEO_H7A3ZI_Q.h
-Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.openocd.target=stm32h7x
-Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H7A3.svd
-
 # NUCLEO_L496ZG board
 Nucleo_144.menu.pnum.NUCLEO_L496ZG=Nucleo L496ZG
 Nucleo_144.menu.pnum.NUCLEO_L496ZG.node=NODE_L496ZG
@@ -301,7 +283,7 @@ Nucleo_144.menu.pnum.NUCLEO_L496ZG.build.board=NUCLEO_L496ZG
 Nucleo_144.menu.pnum.NUCLEO_L496ZG.build.series=STM32L4xx
 Nucleo_144.menu.pnum.NUCLEO_L496ZG.build.product_line=STM32L496xx
 Nucleo_144.menu.pnum.NUCLEO_L496ZG.build.variant=STM32L4xx/L496Z(E-G)T_L4A6ZGT
-Nucleo_144.menu.pnum.NUCLEO_L496ZG.openocd.target=stm32l4x
+Nucleo_144.menu.pnum.NUCLEO_L496ZG.debug.server.openocd.scripts.2=target/stm32l4x.cfg
 Nucleo_144.menu.pnum.NUCLEO_L496ZG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L496.svd
 
 # NUCLEO_L496ZG-P board
@@ -316,7 +298,7 @@ Nucleo_144.menu.pnum.NUCLEO_L496ZG-P.build.board=NUCLEO_L496ZG_P
 Nucleo_144.menu.pnum.NUCLEO_L496ZG-P.build.series=STM32L4xx
 Nucleo_144.menu.pnum.NUCLEO_L496ZG-P.build.product_line=STM32L496xx
 Nucleo_144.menu.pnum.NUCLEO_L496ZG-P.build.variant=STM32L4xx/L496ZGTxP_L4A6ZGTxP
-Nucleo_144.menu.pnum.NUCLEO_L496ZG-P.openocd.target=stm32l4x
+Nucleo_144.menu.pnum.NUCLEO_L496ZG-P.debug.server.openocd.scripts.2=target/stm32l4x.cfg
 Nucleo_144.menu.pnum.NUCLEO_L496ZG-P.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L496.svd
 
 # NUCLEO_L4R5ZI board
@@ -331,7 +313,7 @@ Nucleo_144.menu.pnum.NUCLEO_L4R5ZI.build.board=NUCLEO_L4R5ZI
 Nucleo_144.menu.pnum.NUCLEO_L4R5ZI.build.series=STM32L4xx
 Nucleo_144.menu.pnum.NUCLEO_L4R5ZI.build.product_line=STM32L4R5xx
 Nucleo_144.menu.pnum.NUCLEO_L4R5ZI.build.variant=STM32L4xx/L4R5Z(G-I)T_L4R7ZIT_L4S5ZIT_L4S7ZIT
-Nucleo_144.menu.pnum.NUCLEO_L4R5ZI.openocd.target=stm32l4x
+Nucleo_144.menu.pnum.NUCLEO_L4R5ZI.debug.server.openocd.scripts.2=target/stm32l4x.cfg
 Nucleo_144.menu.pnum.NUCLEO_L4R5ZI.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4R5.svd
 
 # NUCLEO_L4R5ZI-P board
@@ -346,7 +328,7 @@ Nucleo_144.menu.pnum.NUCLEO_L4R5ZI_P.build.board=NUCLEO_L4R5ZI_P
 Nucleo_144.menu.pnum.NUCLEO_L4R5ZI_P.build.series=STM32L4xx
 Nucleo_144.menu.pnum.NUCLEO_L4R5ZI_P.build.product_line=STM32L4R5xx
 Nucleo_144.menu.pnum.NUCLEO_L4R5ZI_P.build.variant=STM32L4xx/L4R5ZITxP
-Nucleo_144.menu.pnum.NUCLEO_L4R5ZI_P.openocd.target=stm32l4x
+Nucleo_144.menu.pnum.NUCLEO_L4R5ZI_P.debug.server.openocd.scripts.2=target/stm32l4x.cfg
 Nucleo_144.menu.pnum.NUCLEO_L4R5ZI_P.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4R5.svd
 
 # NUCLEO_L552ZE-Q board
@@ -361,7 +343,7 @@ Nucleo_144.menu.pnum.NUCLEO_L552ZE_Q.build.board=NUCLEO_L552ZE_Q
 Nucleo_144.menu.pnum.NUCLEO_L552ZE_Q.build.series=STM32L5xx
 Nucleo_144.menu.pnum.NUCLEO_L552ZE_Q.build.product_line=STM32L552xx
 Nucleo_144.menu.pnum.NUCLEO_L552ZE_Q.build.variant=STM32L5xx/L552Z(C-E)TxQ_L562ZETxQ
-Nucleo_144.menu.pnum.NUCLEO_L552ZE_Q.openocd.target=stm32l5x
+Nucleo_144.menu.pnum.NUCLEO_L552ZE_Q.debug.server.openocd.scripts.2=target/stm32l5x.cfg
 Nucleo_144.menu.pnum.NUCLEO_L552ZE_Q.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L5xx/STM32L552.svd
 
 # NUCLEO_U575ZI_Q board
@@ -377,7 +359,7 @@ Nucleo_144.menu.pnum.NUCLEO_U575ZI_Q.build.series=STM32U5xx
 Nucleo_144.menu.pnum.NUCLEO_U575ZI_Q.build.product_line=STM32U575xx
 Nucleo_144.menu.pnum.NUCLEO_U575ZI_Q.build.variant=STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ
 Nucleo_144.menu.pnum.NUCLEO_U575ZI_Q.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Nucleo_144.menu.pnum.NUCLEO_U575ZI_Q.openocd.target=stm32u5x
+Nucleo_144.menu.pnum.NUCLEO_U575ZI_Q.debug.server.openocd.scripts.2=target/stm32u5x.cfg
 Nucleo_144.menu.pnum.NUCLEO_U575ZI_Q.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U5xx/STM32U575.svd
 
 # Upload menu
@@ -390,11 +372,6 @@ Nucleo_144.menu.upload_method.swdMethod.upload.protocol=swd
 Nucleo_144.menu.upload_method.swdMethod.upload.options=
 Nucleo_144.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-Nucleo_144.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-Nucleo_144.menu.upload_method.jlinkMethod.upload.protocol=jlink
-Nucleo_144.menu.upload_method.jlinkMethod.upload.options=
-Nucleo_144.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 Nucleo_144.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 Nucleo_144.menu.upload_method.serialMethod.upload.protocol=serial
 Nucleo_144.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -405,18 +382,6 @@ Nucleo_144.menu.upload_method.dfuMethod.upload.protocol=dfu
 Nucleo_144.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 Nucleo_144.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-Nucleo_144.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-Nucleo_144.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-Nucleo_144.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-Nucleo_144.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-Nucleo_144.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-Nucleo_144.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-Nucleo_144.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-Nucleo_144.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-Nucleo_144.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # Nucleo 64 boards
 
@@ -458,23 +423,9 @@ Nucleo_64.menu.pnum.NUCLEO_C031C6.build.series=STM32C0xx
 Nucleo_64.menu.pnum.NUCLEO_C031C6.build.product_line=STM32C031xx
 Nucleo_64.menu.pnum.NUCLEO_C031C6.build.variant=STM32C0xx/C031C(4-6)(T-U)
 Nucleo_64.menu.pnum.NUCLEO_C031C6.build.st_extra_flags=-D{build.product_line} {build.xSerial} -D__CORTEX_SC=0
-Nucleo_64.menu.pnum.NUCLEO_C031C6.openocd.target=stm32c0x
+Nucleo_64.menu.pnum.NUCLEO_C031C6.debug.server.openocd.scripts.2=target/stm32c0x.cfg
 Nucleo_64.menu.pnum.NUCLEO_C031C6.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32C0xx/STM32C031.svd
 
-# NUCLEO_C071RB board
-Nucleo_64.menu.pnum.NUCLEO_C071RB=Nucleo C071RB
-Nucleo_64.menu.pnum.NUCLEO_C071RB.node="NOD_C071RB"
-Nucleo_64.menu.pnum.NUCLEO_C071RB.upload.maximum_size=131072
-Nucleo_64.menu.pnum.NUCLEO_C071RB.upload.maximum_data_size=24576
-Nucleo_64.menu.pnum.NUCLEO_C071RB.build.mcu=cortex-m0plus
-Nucleo_64.menu.pnum.NUCLEO_C071RB.build.board=NUCLEO_C071RB
-Nucleo_64.menu.pnum.NUCLEO_C071RB.build.series=STM32C0xx
-Nucleo_64.menu.pnum.NUCLEO_C071RB.build.product_line=STM32C071xx
-Nucleo_64.menu.pnum.NUCLEO_C071RB.build.variant=STM32C0xx/C071R(8-B)T
-Nucleo_64.menu.pnum.NUCLEO_C071RB.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Nucleo_64.menu.pnum.NUCLEO_C071RB.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-Nucleo_64.menu.pnum.NUCLEO_C071RB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32C0xx/STM32C071.svd
-
 # NUCLEO_F030R8 board
 Nucleo_64.menu.pnum.NUCLEO_F030R8=Nucleo F030R8
 Nucleo_64.menu.pnum.NUCLEO_F030R8.node="NODE_F030R8,NUCLEO"
@@ -485,7 +436,7 @@ Nucleo_64.menu.pnum.NUCLEO_F030R8.build.board=NUCLEO_F030R8
 Nucleo_64.menu.pnum.NUCLEO_F030R8.build.series=STM32F0xx
 Nucleo_64.menu.pnum.NUCLEO_F030R8.build.product_line=STM32F030x8
 Nucleo_64.menu.pnum.NUCLEO_F030R8.build.variant=STM32F0xx/F030R8T
-Nucleo_64.menu.pnum.NUCLEO_F030R8.openocd.target=stm32f0x
+Nucleo_64.menu.pnum.NUCLEO_F030R8.debug.server.openocd.scripts.2=target/stm32f0x.cfg
 Nucleo_64.menu.pnum.NUCLEO_F030R8.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x0.svd
 
 # NUCLEO_F070RB board
@@ -498,7 +449,7 @@ Nucleo_64.menu.pnum.NUCLEO_F070RB.build.board=NUCLEO_F070RB
 Nucleo_64.menu.pnum.NUCLEO_F070RB.build.series=STM32F0xx
 Nucleo_64.menu.pnum.NUCLEO_F070RB.build.product_line=STM32F070xB
 Nucleo_64.menu.pnum.NUCLEO_F070RB.build.variant=STM32F0xx/F070RBT
-Nucleo_64.menu.pnum.NUCLEO_F070RB.openocd.target=stm32f0x
+Nucleo_64.menu.pnum.NUCLEO_F070RB.debug.server.openocd.scripts.2=target/stm32f0x.cfg
 Nucleo_64.menu.pnum.NUCLEO_F070RB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x0.svd
 
 # NUCLEO_F072RB board
@@ -511,7 +462,7 @@ Nucleo_64.menu.pnum.NUCLEO_F072RB.build.board=NUCLEO_F072RB
 Nucleo_64.menu.pnum.NUCLEO_F072RB.build.series=STM32F0xx
 Nucleo_64.menu.pnum.NUCLEO_F072RB.build.product_line=STM32F072xB
 Nucleo_64.menu.pnum.NUCLEO_F072RB.build.variant=STM32F0xx/F072R8T_F072RB(H-I-T)
-Nucleo_64.menu.pnum.NUCLEO_F072RB.openocd.target=stm32f0x
+Nucleo_64.menu.pnum.NUCLEO_F072RB.debug.server.openocd.scripts.2=target/stm32f0x.cfg
 Nucleo_64.menu.pnum.NUCLEO_F072RB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
 
 # NUCLEO_F091RC board
@@ -524,7 +475,7 @@ Nucleo_64.menu.pnum.NUCLEO_F091RC.build.board=NUCLEO_F091RC
 Nucleo_64.menu.pnum.NUCLEO_F091RC.build.series=STM32F0xx
 Nucleo_64.menu.pnum.NUCLEO_F091RC.build.product_line=STM32F091xC
 Nucleo_64.menu.pnum.NUCLEO_F091RC.build.variant=STM32F0xx/F091RBT_F091RC(H-T-Y)
-Nucleo_64.menu.pnum.NUCLEO_F091RC.openocd.target=stm32f0x
+Nucleo_64.menu.pnum.NUCLEO_F091RC.debug.server.openocd.scripts.2=target/stm32f0x.cfg
 Nucleo_64.menu.pnum.NUCLEO_F091RC.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x1.svd
 
 # NUCLEO_F103RB board
@@ -537,7 +488,7 @@ Nucleo_64.menu.pnum.NUCLEO_F103RB.build.board=NUCLEO_F103RB
 Nucleo_64.menu.pnum.NUCLEO_F103RB.build.series=STM32F1xx
 Nucleo_64.menu.pnum.NUCLEO_F103RB.build.product_line=STM32F103xB
 Nucleo_64.menu.pnum.NUCLEO_F103RB.build.variant=STM32F1xx/F103R(8-B)T
-Nucleo_64.menu.pnum.NUCLEO_F103RB.openocd.target=stm32f1x
+Nucleo_64.menu.pnum.NUCLEO_F103RB.debug.server.openocd.scripts.2=target/stm32f1x.cfg
 Nucleo_64.menu.pnum.NUCLEO_F103RB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F103.svd
 
 # NUCLEO_F302R8 board
@@ -552,7 +503,7 @@ Nucleo_64.menu.pnum.NUCLEO_F302R8.build.board=NUCLEO_F302R8
 Nucleo_64.menu.pnum.NUCLEO_F302R8.build.series=STM32F3xx
 Nucleo_64.menu.pnum.NUCLEO_F302R8.build.product_line=STM32F302x8
 Nucleo_64.menu.pnum.NUCLEO_F302R8.build.variant=STM32F3xx/F302R(6-8)T
-Nucleo_64.menu.pnum.NUCLEO_F302R8.openocd.target=stm32f3x
+Nucleo_64.menu.pnum.NUCLEO_F302R8.debug.server.openocd.scripts.2=target/stm32f3x.cfg
 Nucleo_64.menu.pnum.NUCLEO_F302R8.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F3xx/STM32F302.svd
 
 # NUCLEO_F303RE board
@@ -567,7 +518,7 @@ Nucleo_64.menu.pnum.NUCLEO_F303RE.build.board=NUCLEO_F303RE
 Nucleo_64.menu.pnum.NUCLEO_F303RE.build.series=STM32F3xx
 Nucleo_64.menu.pnum.NUCLEO_F303RE.build.product_line=STM32F303xE
 Nucleo_64.menu.pnum.NUCLEO_F303RE.build.variant=STM32F3xx/F303R(D-E)T
-Nucleo_64.menu.pnum.NUCLEO_F303RE.openocd.target=stm32f3x
+Nucleo_64.menu.pnum.NUCLEO_F303RE.debug.server.openocd.scripts.2=target/stm32f3x.cfg
 Nucleo_64.menu.pnum.NUCLEO_F303RE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F3xx/STM32F303.svd
 
 # NUCLEO_F401RE board
@@ -582,7 +533,7 @@ Nucleo_64.menu.pnum.NUCLEO_F401RE.build.board=NUCLEO_F401RE
 Nucleo_64.menu.pnum.NUCLEO_F401RE.build.series=STM32F4xx
 Nucleo_64.menu.pnum.NUCLEO_F401RE.build.product_line=STM32F401xE
 Nucleo_64.menu.pnum.NUCLEO_F401RE.build.variant=STM32F4xx/F401R(B-C-D-E)T
-Nucleo_64.menu.pnum.NUCLEO_F401RE.openocd.target=stm32f4x
+Nucleo_64.menu.pnum.NUCLEO_F401RE.debug.server.openocd.scripts.2=target/stm32f4x.cfg
 Nucleo_64.menu.pnum.NUCLEO_F401RE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F401.svd
 
 # NUCLEO_F411RE board
@@ -597,7 +548,7 @@ Nucleo_64.menu.pnum.NUCLEO_F411RE.build.board=NUCLEO_F411RE
 Nucleo_64.menu.pnum.NUCLEO_F411RE.build.series=STM32F4xx
 Nucleo_64.menu.pnum.NUCLEO_F411RE.build.product_line=STM32F411xE
 Nucleo_64.menu.pnum.NUCLEO_F411RE.build.variant=STM32F4xx/F411R(C-E)T
-Nucleo_64.menu.pnum.NUCLEO_F411RE.openocd.target=stm32f4x
+Nucleo_64.menu.pnum.NUCLEO_F411RE.debug.server.openocd.scripts.2=target/stm32f4x.cfg
 Nucleo_64.menu.pnum.NUCLEO_F411RE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F411.svd
 
 # NUCLEO_F446RE board
@@ -612,7 +563,7 @@ Nucleo_64.menu.pnum.NUCLEO_F446RE.build.board=NUCLEO_F446RE
 Nucleo_64.menu.pnum.NUCLEO_F446RE.build.series=STM32F4xx
 Nucleo_64.menu.pnum.NUCLEO_F446RE.build.product_line=STM32F446xx
 Nucleo_64.menu.pnum.NUCLEO_F446RE.build.variant=STM32F4xx/F446R(C-E)T
-Nucleo_64.menu.pnum.NUCLEO_F446RE.openocd.target=stm32f4x
+Nucleo_64.menu.pnum.NUCLEO_F446RE.debug.server.openocd.scripts.2=target/stm32f4x.cfg
 Nucleo_64.menu.pnum.NUCLEO_F446RE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F446.svd
 
 # NUCLEO_G070RB board
@@ -626,7 +577,7 @@ Nucleo_64.menu.pnum.NUCLEO_G070RB.build.series=STM32G0xx
 Nucleo_64.menu.pnum.NUCLEO_G070RB.build.product_line=STM32G070xx
 Nucleo_64.menu.pnum.NUCLEO_G070RB.build.variant=STM32G0xx/G070RBT
 Nucleo_64.menu.pnum.NUCLEO_G070RB.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-Nucleo_64.menu.pnum.NUCLEO_G070RB.openocd.target=stm32g0x
+Nucleo_64.menu.pnum.NUCLEO_G070RB.debug.server.openocd.scripts.2=target/stm32g0x.cfg
 Nucleo_64.menu.pnum.NUCLEO_G070RB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G0xx/STM32G070.svd
 
 # NUCLEO_G071RB board
@@ -640,7 +591,7 @@ Nucleo_64.menu.pnum.NUCLEO_G071RB.build.series=STM32G0xx
 Nucleo_64.menu.pnum.NUCLEO_G071RB.build.product_line=STM32G071xx
 Nucleo_64.menu.pnum.NUCLEO_G071RB.build.variant=STM32G0xx/G071R(6-8)T_G071RB(I-T)_G081RB(I-T)
 Nucleo_64.menu.pnum.NUCLEO_G071RB.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-Nucleo_64.menu.pnum.NUCLEO_G071RB.openocd.target=stm32g0x
+Nucleo_64.menu.pnum.NUCLEO_G071RB.debug.server.openocd.scripts.2=target/stm32g0x.cfg
 Nucleo_64.menu.pnum.NUCLEO_G071RB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G0xx/STM32G071.svd
 
 # NUCLEO_G0B1RE board
@@ -654,7 +605,7 @@ Nucleo_64.menu.pnum.NUCLEO_G0B1RE.build.series=STM32G0xx
 Nucleo_64.menu.pnum.NUCLEO_G0B1RE.build.product_line=STM32G0B1xx
 Nucleo_64.menu.pnum.NUCLEO_G0B1RE.build.variant=STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T
 Nucleo_64.menu.pnum.NUCLEO_G0B1RE.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-Nucleo_64.menu.pnum.NUCLEO_G0B1RE.openocd.target=stm32g0x
+Nucleo_64.menu.pnum.NUCLEO_G0B1RE.debug.server.openocd.scripts.2=target/stm32g0x.cfg
 Nucleo_64.menu.pnum.NUCLEO_G0B1RE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G0xx/STM32G0B1.svd
 
 # NUCLEO_G431RB board
@@ -668,8 +619,8 @@ Nucleo_64.menu.pnum.NUCLEO_G431RB.build.float-abi=-mfloat-abi=hard
 Nucleo_64.menu.pnum.NUCLEO_G431RB.build.board=NUCLEO_G431RB
 Nucleo_64.menu.pnum.NUCLEO_G431RB.build.series=STM32G4xx
 Nucleo_64.menu.pnum.NUCLEO_G431RB.build.product_line=STM32G431xx
-Nucleo_64.menu.pnum.NUCLEO_G431RB.build.variant=STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)
-Nucleo_64.menu.pnum.NUCLEO_G431RB.openocd.target=stm32g4x
+Nucleo_64.menu.pnum.NUCLEO_G431RB.build.variant=STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)
+Nucleo_64.menu.pnum.NUCLEO_G431RB.debug.server.openocd.scripts.2=target/stm32g4x.cfg
 Nucleo_64.menu.pnum.NUCLEO_G431RB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G431.svd
 
 # NUCLEO_G474RE board
@@ -683,8 +634,8 @@ Nucleo_64.menu.pnum.NUCLEO_G474RE.build.float-abi=-mfloat-abi=hard
 Nucleo_64.menu.pnum.NUCLEO_G474RE.build.board=NUCLEO_G474RE
 Nucleo_64.menu.pnum.NUCLEO_G474RE.build.series=STM32G4xx
 Nucleo_64.menu.pnum.NUCLEO_G474RE.build.product_line=STM32G474xx
-Nucleo_64.menu.pnum.NUCLEO_G474RE.build.variant=STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET
-Nucleo_64.menu.pnum.NUCLEO_G474RE.openocd.target=stm32g4x
+Nucleo_64.menu.pnum.NUCLEO_G474RE.build.variant=STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET
+Nucleo_64.menu.pnum.NUCLEO_G474RE.debug.server.openocd.scripts.2=target/stm32g4x.cfg
 Nucleo_64.menu.pnum.NUCLEO_G474RE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
 
 # NUCLEO H503RB
@@ -699,7 +650,7 @@ Nucleo_64.menu.pnum.NUCLEO_H503RB.build.board=NUCLEO_H503RB
 Nucleo_64.menu.pnum.NUCLEO_H503RB.build.series=STM32H5xx
 Nucleo_64.menu.pnum.NUCLEO_H503RB.build.product_line=STM32H503xx
 Nucleo_64.menu.pnum.NUCLEO_H503RB.build.variant=STM32H5xx/H503RBT
-Nucleo_64.menu.pnum.NUCLEO_H503RB.openocd.target=stm32h5x
+Nucleo_64.menu.pnum.NUCLEO_H503RB.debug.server.openocd.scripts.2=target/stm32h5x.cfg
 Nucleo_64.menu.pnum.NUCLEO_H503RB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H5xx/STM32H503.svd
 
 # NUCLEO_L010RB board
@@ -713,7 +664,7 @@ Nucleo_64.menu.pnum.NUCLEO_L010RB.build.series=STM32L0xx
 Nucleo_64.menu.pnum.NUCLEO_L010RB.build.product_line=STM32L010xB
 Nucleo_64.menu.pnum.NUCLEO_L010RB.build.variant=STM32L0xx/L010RBT
 Nucleo_64.menu.pnum.NUCLEO_L010RB.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-Nucleo_64.menu.pnum.NUCLEO_L010RB.openocd.target=stm32l0
+Nucleo_64.menu.pnum.NUCLEO_L010RB.debug.server.openocd.scripts.2=target/stm32l0x.cfg
 Nucleo_64.menu.pnum.NUCLEO_L010RB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L0xx/STM32L0x0.svd
 
 # NUCLEO_L053R8 board
@@ -727,7 +678,7 @@ Nucleo_64.menu.pnum.NUCLEO_L053R8.build.series=STM32L0xx
 Nucleo_64.menu.pnum.NUCLEO_L053R8.build.product_line=STM32L053xx
 Nucleo_64.menu.pnum.NUCLEO_L053R8.build.variant=STM32L0xx/L052R(6-8)T_L053R(6-8)T_L063R8T
 Nucleo_64.menu.pnum.NUCLEO_L053R8.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-Nucleo_64.menu.pnum.NUCLEO_L053R8.openocd.target=stm32l0
+Nucleo_64.menu.pnum.NUCLEO_L053R8.debug.server.openocd.scripts.2=target/stm32l0x.cfg
 Nucleo_64.menu.pnum.NUCLEO_L053R8.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L0xx/STM32L053.svd
 
 # NUCLEO_L073RZ board
@@ -741,7 +692,7 @@ Nucleo_64.menu.pnum.NUCLEO_L073RZ.build.series=STM32L0xx
 Nucleo_64.menu.pnum.NUCLEO_L073RZ.build.product_line=STM32L073xx
 Nucleo_64.menu.pnum.NUCLEO_L073RZ.build.variant=STM32L0xx/L072R(B-Z)T_L073R(B-Z)T_L083R(B-Z)T
 Nucleo_64.menu.pnum.NUCLEO_L073RZ.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-Nucleo_64.menu.pnum.NUCLEO_L073RZ.openocd.target=stm32l0
+Nucleo_64.menu.pnum.NUCLEO_L073RZ.debug.server.openocd.scripts.2=target/stm32l0x.cfg
 Nucleo_64.menu.pnum.NUCLEO_L073RZ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L0xx/STM32L0x3.svd
 
 # NUCLEO_L152RE board
@@ -754,7 +705,7 @@ Nucleo_64.menu.pnum.NUCLEO_L152RE.build.board=NUCLEO_L152RE
 Nucleo_64.menu.pnum.NUCLEO_L152RE.build.series=STM32L1xx
 Nucleo_64.menu.pnum.NUCLEO_L152RE.build.product_line=STM32L152xE
 Nucleo_64.menu.pnum.NUCLEO_L152RE.build.variant=STM32L1xx/L151RET_L152RET_L162RET
-Nucleo_64.menu.pnum.NUCLEO_L152RE.openocd.target=stm32l1
+Nucleo_64.menu.pnum.NUCLEO_L152RE.debug.server.openocd.scripts.2=target/stm32l1x.cfg
 Nucleo_64.menu.pnum.NUCLEO_L152RE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L1xx/STM32L152.svd
 
 # NUCLEO_L433RC_P board
@@ -769,7 +720,7 @@ Nucleo_64.menu.pnum.NUCLEO_L433RC_P.build.board=NUCLEO_L433RC_P
 Nucleo_64.menu.pnum.NUCLEO_L433RC_P.build.series=STM32L4xx
 Nucleo_64.menu.pnum.NUCLEO_L433RC_P.build.product_line=STM32L433xx
 Nucleo_64.menu.pnum.NUCLEO_L433RC_P.build.variant=STM32L4xx/L433RCTxP
-Nucleo_64.menu.pnum.NUCLEO_L433RC_P.openocd.target=stm32l4x
+Nucleo_64.menu.pnum.NUCLEO_L433RC_P.debug.server.openocd.scripts.2=target/stm32l4x.cfg
 Nucleo_64.menu.pnum.NUCLEO_L433RC_P.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
 
 # NUCLEO_L452RE board
@@ -784,7 +735,7 @@ Nucleo_64.menu.pnum.NUCLEO_L452RE.build.board=NUCLEO_L452RE
 Nucleo_64.menu.pnum.NUCLEO_L452RE.build.series=STM32L4xx
 Nucleo_64.menu.pnum.NUCLEO_L452RE.build.product_line=STM32L452xx
 Nucleo_64.menu.pnum.NUCLEO_L452RE.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
-Nucleo_64.menu.pnum.NUCLEO_L452RE.openocd.target=stm32l4x
+Nucleo_64.menu.pnum.NUCLEO_L452RE.debug.server.openocd.scripts.2=target/stm32l4x.cfg
 Nucleo_64.menu.pnum.NUCLEO_L452RE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
 
 # NUCLEO_L452RE-P board
@@ -799,7 +750,7 @@ Nucleo_64.menu.pnum.NUCLEO_L452REP.build.board=NUCLEO_L452RE_P
 Nucleo_64.menu.pnum.NUCLEO_L452REP.build.series=STM32L4xx
 Nucleo_64.menu.pnum.NUCLEO_L452REP.build.product_line=STM32L452xx
 Nucleo_64.menu.pnum.NUCLEO_L452REP.build.variant=STM32L4xx/L452RETxP
-Nucleo_64.menu.pnum.NUCLEO_L452REP.openocd.target=stm32l4x
+Nucleo_64.menu.pnum.NUCLEO_L452REP.debug.server.openocd.scripts.2=target/stm32l4x.cfg
 Nucleo_64.menu.pnum.NUCLEO_L452REP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
 
 # NUCLEO_L476RG board
@@ -814,23 +765,9 @@ Nucleo_64.menu.pnum.NUCLEO_L476RG.build.board=NUCLEO_L476RG
 Nucleo_64.menu.pnum.NUCLEO_L476RG.build.series=STM32L4xx
 Nucleo_64.menu.pnum.NUCLEO_L476RG.build.product_line=STM32L476xx
 Nucleo_64.menu.pnum.NUCLEO_L476RG.build.variant=STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT
-Nucleo_64.menu.pnum.NUCLEO_L476RG.openocd.target=stm32l4x
+Nucleo_64.menu.pnum.NUCLEO_L476RG.debug.server.openocd.scripts.2=target/stm32l4x.cfg
 Nucleo_64.menu.pnum.NUCLEO_L476RG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L476.svd
 
-# NUCLEO_U083RC board
-Nucleo_64.menu.pnum.NUCLEO_U083RC=Nucleo U083RC
-Nucleo_64.menu.pnum.NUCLEO_U083RC.node=NOD_U083RC
-Nucleo_64.menu.pnum.NUCLEO_U083RC.upload.maximum_size=262144
-Nucleo_64.menu.pnum.NUCLEO_U083RC.upload.maximum_data_size=40960
-Nucleo_64.menu.pnum.NUCLEO_U083RC.build.mcu=cortex-m0plus
-Nucleo_64.menu.pnum.NUCLEO_U083RC.build.board=NUCLEO_U083RC
-Nucleo_64.menu.pnum.NUCLEO_U083RC.build.series=STM32U0xx
-Nucleo_64.menu.pnum.NUCLEO_U083RC.build.product_line=STM32U083xx
-Nucleo_64.menu.pnum.NUCLEO_U083RC.build.variant=STM32U0xx/U073R(8-B-C)(I-T)_U083RC(I-T)
-Nucleo_64.menu.pnum.NUCLEO_U083RC.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-Nucleo_64.menu.pnum.NUCLEO_U083RC.openocd.target=stm32u0x
-Nucleo_64.menu.pnum.NUCLEO_U083RC.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U0xx/STM32U083.svd
-
 # NUCLEO_WB15CC
 Nucleo_64.menu.pnum.NUCLEO_WB15CC=Nucleo WB15CC
 Nucleo_64.menu.pnum.NUCLEO_WB15CC.node="NOD_WB15CC"
@@ -843,7 +780,7 @@ Nucleo_64.menu.pnum.NUCLEO_WB15CC.build.board=NUCLEO_WB15CC
 Nucleo_64.menu.pnum.NUCLEO_WB15CC.build.series=STM32WBxx
 Nucleo_64.menu.pnum.NUCLEO_WB15CC.build.product_line=STM32WB15xx
 Nucleo_64.menu.pnum.NUCLEO_WB15CC.build.variant=STM32WBxx/WB15CCU
-Nucleo_64.menu.pnum.NUCLEO_WB15CC.openocd.target=stm32wbx
+Nucleo_64.menu.pnum.NUCLEO_WB15CC.debug.server.openocd.scripts.2=target/stm32wbx.cfg
 Nucleo_64.menu.pnum.NUCLEO_WB15CC.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WBxx/STM32WB15_CM4.svd
 
 # P_NUCLEO_WB55RG board
@@ -858,7 +795,7 @@ Nucleo_64.menu.pnum.P_NUCLEO_WB55RG.build.board=P_NUCLEO_WB55RG
 Nucleo_64.menu.pnum.P_NUCLEO_WB55RG.build.series=STM32WBxx
 Nucleo_64.menu.pnum.P_NUCLEO_WB55RG.build.product_line=STM32WB55xx
 Nucleo_64.menu.pnum.P_NUCLEO_WB55RG.build.variant=STM32WBxx/WB55R(C-E-G)V
-Nucleo_64.menu.pnum.P_NUCLEO_WB55RG.openocd.target=stm32wbx
+Nucleo_64.menu.pnum.P_NUCLEO_WB55RG.debug.server.openocd.scripts.2=target/stm32wbx.cfg
 Nucleo_64.menu.pnum.P_NUCLEO_WB55RG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WBxx/STM32WB55_CM4.svd
 
 # P_NUCLEO_WB55 USB Dongle
@@ -873,7 +810,7 @@ Nucleo_64.menu.pnum.P_NUCLEO_WB55_USB_DONGLE.build.board=P_NUCLEO_WB55_USB_DONGL
 Nucleo_64.menu.pnum.P_NUCLEO_WB55_USB_DONGLE.build.series=STM32WBxx
 Nucleo_64.menu.pnum.P_NUCLEO_WB55_USB_DONGLE.build.product_line=STM32WB55xx
 Nucleo_64.menu.pnum.P_NUCLEO_WB55_USB_DONGLE.build.variant=STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U
-Nucleo_64.menu.pnum.P_NUCLEO_WB55_USB_DONGLE.openocd.target=stm32wbx
+Nucleo_64.menu.pnum.P_NUCLEO_WB55_USB_DONGLE.debug.server.openocd.scripts.2=target/stm32wbx.cfg
 Nucleo_64.menu.pnum.P_NUCLEO_WB55_USB_DONGLE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WBxx/STM32WB55_CM4.svd
 
 # NUCLEO WBA55CG
@@ -888,7 +825,7 @@ Nucleo_64.menu.pnum.NUCLEO_WBA55CG.build.board=NUCLEO_WBA55CG
 Nucleo_64.menu.pnum.NUCLEO_WBA55CG.build.series=STM32WBAxx
 Nucleo_64.menu.pnum.NUCLEO_WBA55CG.build.product_line=STM32WBA55xx
 Nucleo_64.menu.pnum.NUCLEO_WBA55CG.build.variant=STM32WBAxx/WBA55C(E-G)U
-Nucleo_64.menu.pnum.NUCLEO_WBA55CG.openocd.target=stm32wbax
+Nucleo_64.menu.pnum.NUCLEO_WBA55CG.debug.server.openocd.scripts.2=target/stm32wbax.cfg
 Nucleo_64.menu.pnum.NUCLEO_WBA55CG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WBAxx/STM32WBA55.svd
 
 # NUCLEO_WL55JC1 board
@@ -902,7 +839,7 @@ Nucleo_64.menu.pnum.NUCLEO_WL55JC1.build.series=STM32WLxx
 Nucleo_64.menu.pnum.NUCLEO_WL55JC1.build.product_line=STM32WLE5xx
 Nucleo_64.menu.pnum.NUCLEO_WL55JC1.build.variant=STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I
 Nucleo_64.menu.pnum.NUCLEO_WL55JC1.build.st_extra_flags=-D{build.product_line} -DUSE_CM4_STARTUP_FILE {build.xSerial}
-Nucleo_64.menu.pnum.NUCLEO_WL55JC1.openocd.target=stm32wlx
+Nucleo_64.menu.pnum.NUCLEO_WL55JC1.debug.server.openocd.scripts.2=target/stm32wlx.cfg
 Nucleo_64.menu.pnum.NUCLEO_WL55JC1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WLxx/STM32WLE5_CM4.svd
 
 # Upload menu
@@ -915,11 +852,6 @@ Nucleo_64.menu.upload_method.swdMethod.upload.protocol=swd
 Nucleo_64.menu.upload_method.swdMethod.upload.options=
 Nucleo_64.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-Nucleo_64.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-Nucleo_64.menu.upload_method.jlinkMethod.upload.protocol=jlink
-Nucleo_64.menu.upload_method.jlinkMethod.upload.options=
-Nucleo_64.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 Nucleo_64.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 Nucleo_64.menu.upload_method.serialMethod.upload.protocol=serial
 Nucleo_64.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -930,18 +862,6 @@ Nucleo_64.menu.upload_method.dfuMethod.upload.protocol=dfu
 Nucleo_64.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 Nucleo_64.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-Nucleo_64.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-Nucleo_64.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-Nucleo_64.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-Nucleo_64.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-Nucleo_64.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-Nucleo_64.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-Nucleo_64.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-Nucleo_64.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-Nucleo_64.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # Nucleo 32 boards
 
@@ -982,7 +902,7 @@ Nucleo_32.menu.pnum.NUCLEO_F031K6.build.board=NUCLEO_F031K6
 Nucleo_32.menu.pnum.NUCLEO_F031K6.build.series=STM32F0xx
 Nucleo_32.menu.pnum.NUCLEO_F031K6.build.product_line=STM32F031x6
 Nucleo_32.menu.pnum.NUCLEO_F031K6.build.variant=STM32F0xx/F031K6T
-Nucleo_32.menu.pnum.NUCLEO_F031K6.openocd.target=stm32f0x
+Nucleo_32.menu.pnum.NUCLEO_F031K6.debug.server.openocd.scripts.2=target/stm32f0x.cfg
 Nucleo_32.menu.pnum.NUCLEO_F031K6.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x1.svd
 
 # NUCLEO_F042K6 board
@@ -995,7 +915,7 @@ Nucleo_32.menu.pnum.NUCLEO_F042K6.build.board=NUCLEO_F042K6
 Nucleo_32.menu.pnum.NUCLEO_F042K6.build.series=STM32F0xx
 Nucleo_32.menu.pnum.NUCLEO_F042K6.build.product_line=STM32F042x6
 Nucleo_32.menu.pnum.NUCLEO_F042K6.build.variant=STM32F0xx/F042K(4-6)T
-Nucleo_32.menu.pnum.NUCLEO_F042K6.openocd.target=stm32f0x
+Nucleo_32.menu.pnum.NUCLEO_F042K6.debug.server.openocd.scripts.2=target/stm32f0x.cfg
 Nucleo_32.menu.pnum.NUCLEO_F042K6.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
 
 # NUCLEO_F303K8 board
@@ -1010,7 +930,7 @@ Nucleo_32.menu.pnum.NUCLEO_F303K8.build.board=NUCLEO_F303K8
 Nucleo_32.menu.pnum.NUCLEO_F303K8.build.series=STM32F3xx
 Nucleo_32.menu.pnum.NUCLEO_F303K8.build.product_line=STM32F303x8
 Nucleo_32.menu.pnum.NUCLEO_F303K8.build.variant=STM32F3xx/F303K(6-8)T_F334K(4-6-8)T
-Nucleo_32.menu.pnum.NUCLEO_F303K8.openocd.target=stm32f3x
+Nucleo_32.menu.pnum.NUCLEO_F303K8.debug.server.openocd.scripts.2=target/stm32f3x.cfg
 Nucleo_32.menu.pnum.NUCLEO_F303K8.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F3xx/STM32F303.svd
 
 # NUCLEO_G031K8 board
@@ -1024,7 +944,7 @@ Nucleo_32.menu.pnum.NUCLEO_G031K8.build.series=STM32G0xx
 Nucleo_32.menu.pnum.NUCLEO_G031K8.build.product_line=STM32G031xx
 Nucleo_32.menu.pnum.NUCLEO_G031K8.build.variant=STM32G0xx/G031K(4-6-8)(T-U)_G041K(6-8)(T-U)
 Nucleo_32.menu.pnum.NUCLEO_G031K8.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-Nucleo_32.menu.pnum.NUCLEO_G031K8.openocd.target=stm32g0x
+Nucleo_32.menu.pnum.NUCLEO_G031K8.debug.server.openocd.scripts.2=target/stm32g0x.cfg
 Nucleo_32.menu.pnum.NUCLEO_G031K8.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G0xx/STM32G031.svd
 
 # NUCLEO_G431KB board
@@ -1039,7 +959,7 @@ Nucleo_32.menu.pnum.NUCLEO_G431KB.build.board=NUCLEO_G431KB
 Nucleo_32.menu.pnum.NUCLEO_G431KB.build.series=STM32G4xx
 Nucleo_32.menu.pnum.NUCLEO_G431KB.build.product_line=STM32G431xx
 Nucleo_32.menu.pnum.NUCLEO_G431KB.build.variant=STM32G4xx/G431K(6-8-B)(T-U)_G441KB(T-U)
-Nucleo_32.menu.pnum.NUCLEO_G431KB.openocd.target=stm32g4x
+Nucleo_32.menu.pnum.NUCLEO_G431KB.debug.server.openocd.scripts.2=target/stm32g4x.cfg
 Nucleo_32.menu.pnum.NUCLEO_G431KB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G431.svd
 
 # NUCLEO_L031K6 board
@@ -1052,7 +972,7 @@ Nucleo_32.menu.pnum.NUCLEO_L031K6.build.board=NUCLEO_L031K6
 Nucleo_32.menu.pnum.NUCLEO_L031K6.build.series=STM32L0xx
 Nucleo_32.menu.pnum.NUCLEO_L031K6.build.product_line=STM32L031xx
 Nucleo_32.menu.pnum.NUCLEO_L031K6.build.variant=STM32L0xx/L031K(4-6)T_L041K6T
-Nucleo_32.menu.pnum.NUCLEO_L031K6.openocd.target=stm32l0
+Nucleo_32.menu.pnum.NUCLEO_L031K6.debug.server.openocd.scripts.2=target/stm32l0x.cfg
 Nucleo_32.menu.pnum.NUCLEO_L031K6.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L0xx/STM32L0x1.svd
 
 # NUCLEO_L412KB board
@@ -1067,7 +987,7 @@ Nucleo_32.menu.pnum.NUCLEO_L412KB.build.board=NUCLEO_L412KB
 Nucleo_32.menu.pnum.NUCLEO_L412KB.build.series=STM32L4xx
 Nucleo_32.menu.pnum.NUCLEO_L412KB.build.product_line=STM32L412xx
 Nucleo_32.menu.pnum.NUCLEO_L412KB.build.variant=STM32L4xx/L412K(8-B)(T-U)_L422KB(T-U)
-Nucleo_32.menu.pnum.NUCLEO_L412KB.openocd.target=stm32l4x
+Nucleo_32.menu.pnum.NUCLEO_L412KB.debug.server.openocd.scripts.2=target/stm32l4x.cfg
 Nucleo_32.menu.pnum.NUCLEO_L412KB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L412.svd
 
 # NUCLEO_L432KC board
@@ -1082,7 +1002,7 @@ Nucleo_32.menu.pnum.NUCLEO_L432KC.build.board=NUCLEO_L432KC
 Nucleo_32.menu.pnum.NUCLEO_L432KC.build.series=STM32L4xx
 Nucleo_32.menu.pnum.NUCLEO_L432KC.build.product_line=STM32L432xx
 Nucleo_32.menu.pnum.NUCLEO_L432KC.build.variant=STM32L4xx/L432K(B-C)U_L442KCU
-Nucleo_32.menu.pnum.NUCLEO_L432KC.openocd.target=stm32l4x
+Nucleo_32.menu.pnum.NUCLEO_L432KC.debug.server.openocd.scripts.2=target/stm32l4x.cfg
 Nucleo_32.menu.pnum.NUCLEO_L432KC.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
 
 # Upload menu
@@ -1095,11 +1015,6 @@ Nucleo_32.menu.upload_method.swdMethod.upload.protocol=swd
 Nucleo_32.menu.upload_method.swdMethod.upload.options=
 Nucleo_32.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-Nucleo_32.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-Nucleo_32.menu.upload_method.jlinkMethod.upload.protocol=jlink
-Nucleo_32.menu.upload_method.jlinkMethod.upload.options=
-Nucleo_32.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 Nucleo_32.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 Nucleo_32.menu.upload_method.serialMethod.upload.protocol=serial
 Nucleo_32.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -1110,18 +1025,6 @@ Nucleo_32.menu.upload_method.dfuMethod.upload.protocol=dfu
 Nucleo_32.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 Nucleo_32.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-Nucleo_32.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-Nucleo_32.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-Nucleo_32.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-Nucleo_32.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-Nucleo_32.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-Nucleo_32.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-Nucleo_32.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-Nucleo_32.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-Nucleo_32.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # Discovery boards
 
@@ -1165,7 +1068,7 @@ Disco.menu.pnum.B_G431B_ESC1.build.series=STM32G4xx
 Disco.menu.pnum.B_G431B_ESC1.build.product_line=STM32G431xx
 Disco.menu.pnum.B_G431B_ESC1.build.variant=STM32G4xx/G431C(6-8-B)U_G441CBU
 Disco.menu.pnum.B_G431B_ESC1.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Disco.menu.pnum.B_G431B_ESC1.openocd.target=stm32g4x
+Disco.menu.pnum.B_G431B_ESC1.debug.server.openocd.scripts.2=target/stm32g4x.cfg
 Disco.menu.pnum.B_G431B_ESC1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G431.svd
 
 # B-L072Z-LRWAN1 board
@@ -1180,7 +1083,7 @@ Disco.menu.pnum.B_L072Z_LRWAN1.build.product_line=STM32L072xx
 Disco.menu.pnum.B_L072Z_LRWAN1.build.variant=STM32L0xx/L072CBY_L072CZ(E-Y)_L073CZY_L082CZY
 Disco.menu.pnum.B_L072Z_LRWAN1.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 Disco.menu.pnum.B_L072Z_LRWAN1.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-Disco.menu.pnum.B_L072Z_LRWAN1.openocd.target=stm32l0
+Disco.menu.pnum.B_L072Z_LRWAN1.debug.server.openocd.scripts.2=target/stm32l0x.cfg
 Disco.menu.pnum.B_L072Z_LRWAN1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L0xx/STM32L0x2.svd
 
 # B-L475E-IOT01A board
@@ -1196,7 +1099,7 @@ Disco.menu.pnum.B_L475E_IOT01A.build.series=STM32L4xx
 Disco.menu.pnum.B_L475E_IOT01A.build.product_line=STM32L475xx
 Disco.menu.pnum.B_L475E_IOT01A.build.variant=STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT
 Disco.menu.pnum.B_L475E_IOT01A.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Disco.menu.pnum.B_L475E_IOT01A.openocd.target=stm32l4x
+Disco.menu.pnum.B_L475E_IOT01A.debug.server.openocd.scripts.2=target/stm32l4x.cfg
 Disco.menu.pnum.B_L475E_IOT01A.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x5.svd
 
 # B_L4S5I_IOT01A board
@@ -1212,7 +1115,7 @@ Disco.menu.pnum.B_L4S5I_IOT01A.build.series=STM32L4xx
 Disco.menu.pnum.B_L4S5I_IOT01A.build.product_line=STM32L4S5xx
 Disco.menu.pnum.B_L4S5I_IOT01A.build.variant=STM32L4xx/L4R5V(G-I)T_L4R7VIT_L4S5VIT_L4S7VIT
 Disco.menu.pnum.B_L4S5I_IOT01A.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Disco.menu.pnum.B_L4S5I_IOT01A.openocd.target=stm32l4x
+Disco.menu.pnum.B_L4S5I_IOT01A.debug.server.openocd.scripts.2=target/stm32l4x.cfg
 Disco.menu.pnum.B_L4S5I_IOT01A.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4S5.svd
 
 # B_U585I_IOT02A board
@@ -1228,7 +1131,7 @@ Disco.menu.pnum.B_U585I_IOT02A.build.series=STM32U5xx
 Disco.menu.pnum.B_U585I_IOT02A.build.product_line=STM32U585xx
 Disco.menu.pnum.B_U585I_IOT02A.build.variant=STM32U5xx/U575A(G-I)IxQ_U585AIIxQ
 Disco.menu.pnum.B_U585I_IOT02A.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Disco.menu.pnum.B_U585I_IOT02A.openocd.target=stm32u5x
+Disco.menu.pnum.B_U585I_IOT02A.debug.server.openocd.scripts.2=target/stm32u5x.cfg
 Disco.menu.pnum.B_U585I_IOT02A.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U5xx/STM32U585.svd
 
 # STM32C0316-DK board
@@ -1242,7 +1145,7 @@ Disco.menu.pnum.STM32C0116_DK.build.series=STM32C0xx
 Disco.menu.pnum.STM32C0116_DK.build.product_line=STM32C011xx
 Disco.menu.pnum.STM32C0116_DK.build.variant=STM32C0xx/C011D6Y_C011F(4-6)(P-U)_C031F(4-6)P
 Disco.menu.pnum.STM32C0116_DK.build.st_extra_flags=-D{build.product_line} {build.xSerial} -D__CORTEX_SC=0
-Disco.menu.pnum.STM32C0116_DK.openocd.target=stm32c0x
+Disco.menu.pnum.STM32C0116_DK.debug.server.openocd.scripts.2=target/stm32c0x.cfg
 Disco.menu.pnum.STM32C0116_DK.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32C0xx/STM32C011.svd
 
 # STM32C0316-DK board
@@ -1256,7 +1159,7 @@ Disco.menu.pnum.STM32C0316_DK.build.series=STM32C0xx
 Disco.menu.pnum.STM32C0316_DK.build.product_line=STM32C031xx
 Disco.menu.pnum.STM32C0316_DK.build.variant=STM32C0xx/C031C(4-6)(T-U)
 Disco.menu.pnum.STM32C0316_DK.build.st_extra_flags=-D{build.product_line} {build.xSerial} -D__CORTEX_SC=0
-Disco.menu.pnum.STM32C0316_DK.openocd.target=stm32c0x
+Disco.menu.pnum.STM32C0316_DK.debug.server.openocd.scripts.2=target/stm32c0x.cfg
 Disco.menu.pnum.STM32C0316_DK.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32C0xx/STM32C031.svd
 
 # DISCO_F030R8 board
@@ -1269,7 +1172,7 @@ Disco.menu.pnum.DISCO_F030R8.build.board=DISCO_F030R8
 Disco.menu.pnum.DISCO_F030R8.build.series=STM32F0xx
 Disco.menu.pnum.DISCO_F030R8.build.product_line=STM32F030x8
 Disco.menu.pnum.DISCO_F030R8.build.variant=STM32F0xx/F030R8T
-Disco.menu.pnum.DISCO_F030R8.openocd.target=stm32f0x
+Disco.menu.pnum.DISCO_F030R8.debug.server.openocd.scripts.2=target/stm32f0x.cfg
 Disco.menu.pnum.DISCO_F030R8.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x0.svd
 
 # DISCO_F072RB board
@@ -1282,7 +1185,7 @@ Disco.menu.pnum.DISCO_F072RB.build.board=DISCO_F072RB
 Disco.menu.pnum.DISCO_F072RB.build.series=STM32F0xx
 Disco.menu.pnum.DISCO_F072RB.build.product_line=STM32F072xB
 Disco.menu.pnum.DISCO_F072RB.build.variant=STM32F0xx/F072R8T_F072RB(H-I-T)
-Disco.menu.pnum.DISCO_F072RB.openocd.target=stm32f0x
+Disco.menu.pnum.DISCO_F072RB.debug.server.openocd.scripts.2=target/stm32f0x.cfg
 Disco.menu.pnum.DISCO_F072RB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
 
 # DISCO_F100RB board
@@ -1295,7 +1198,7 @@ Disco.menu.pnum.DISCO_F100RB.build.board=DISCO_F100RB
 Disco.menu.pnum.DISCO_F100RB.build.series=STM32F1xx
 Disco.menu.pnum.DISCO_F100RB.build.product_line=STM32F100xB
 Disco.menu.pnum.DISCO_F100RB.build.variant=STM32F1xx/F100R(8-B)T
-Disco.menu.pnum.DISCO_F100RB.openocd.target=stm32f1x
+Disco.menu.pnum.DISCO_F100RB.debug.server.openocd.scripts.2=target/stm32f1x.cfg
 Disco.menu.pnum.DISCO_F100RB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F100.svd
 
 # DISCO_F303VC board
@@ -1310,7 +1213,7 @@ Disco.menu.pnum.DISCO_F303VC.build.board=DISCO_F303VC
 Disco.menu.pnum.DISCO_F303VC.build.series=STM32F3xx
 Disco.menu.pnum.DISCO_F303VC.build.product_line=STM32F303xC
 Disco.menu.pnum.DISCO_F303VC.build.variant=STM32F3xx/F303V(B-C)T
-Disco.menu.pnum.DISCO_F303VC.openocd.target=stm32f3x
+Disco.menu.pnum.DISCO_F303VC.debug.server.openocd.scripts.2=target/stm32f3x.cfg
 Disco.menu.pnum.DISCO_F303VC.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F3xx/STM32F303.svd
 
 # DISCO_F407VG board
@@ -1325,7 +1228,7 @@ Disco.menu.pnum.DISCO_F407VG.build.board=DISCO_F407VG
 Disco.menu.pnum.DISCO_F407VG.build.series=STM32F4xx
 Disco.menu.pnum.DISCO_F407VG.build.product_line=STM32F407xx
 Disco.menu.pnum.DISCO_F407VG.build.variant=STM32F4xx/F407V(E-G)T_F417V(E-G)T
-Disco.menu.pnum.DISCO_F407VG.openocd.target=stm32f4x
+Disco.menu.pnum.DISCO_F407VG.debug.server.openocd.scripts.2=target/stm32f4x.cfg
 Disco.menu.pnum.DISCO_F407VG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F407.svd
 
 # DISCO_F413ZH board
@@ -1341,7 +1244,7 @@ Disco.menu.pnum.DISCO_F413ZH.build.series=STM32F4xx
 Disco.menu.pnum.DISCO_F413ZH.build.product_line=STM32F413xx
 Disco.menu.pnum.DISCO_F413ZH.build.variant=STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)
 Disco.menu.pnum.DISCO_F413ZH.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Disco.menu.pnum.DISCO_F413ZH.openocd.target=stm32f4x
+Disco.menu.pnum.DISCO_F413ZH.debug.server.openocd.scripts.2=target/stm32f4x.cfg
 Disco.menu.pnum.DISCO_F413ZH.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F413.svd
 
 # DISCO_F746NG board
@@ -1357,7 +1260,7 @@ Disco.menu.pnum.DISCO_F746NG.build.series=STM32F7xx
 Disco.menu.pnum.DISCO_F746NG.build.product_line=STM32F746xx
 Disco.menu.pnum.DISCO_F746NG.build.variant=STM32F7xx/F746B(E-G)T_F746N(E-G)H_F750N8H_F756BGT_F756NGH
 Disco.menu.pnum.DISCO_F746NG.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Disco.menu.pnum.DISCO_F746NG.openocd.target=stm32f7x
+Disco.menu.pnum.DISCO_F746NG.debug.server.openocd.scripts.2=target/stm32f7x.cfg
 Disco.menu.pnum.DISCO_F746NG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F7xx/STM32F746.svd
 
 # DISCO_G0316 board
@@ -1371,7 +1274,7 @@ Disco.menu.pnum.DISCO_G0316.build.series=STM32G0xx
 Disco.menu.pnum.DISCO_G0316.build.product_line=STM32G031xx
 Disco.menu.pnum.DISCO_G0316.build.variant=STM32G0xx/G031J(4-6)M_G041J6M
 Disco.menu.pnum.DISCO_G0316.build.st_extra_flags=-D{build.product_line} {build.xSerial} -D__CORTEX_SC=0
-Disco.menu.pnum.DISCO_G0316.openocd.target=stm32g0x
+Disco.menu.pnum.DISCO_G0316.debug.server.openocd.scripts.2=target/stm32g0x.cfg
 Disco.menu.pnum.DISCO_G0316.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G0xx/STM32G031.svd
 
 # STM32H573I-DK
@@ -1387,7 +1290,7 @@ Disco.menu.pnum.STM32H573I_DK.build.series=STM32H5xx
 Disco.menu.pnum.STM32H573I_DK.build.product_line=STM32H573xx
 Disco.menu.pnum.STM32H573I_DK.build.variant=STM32H5xx/H563IIKxQ_H573IIKxQ
 Disco.menu.pnum.STM32H573I_DK.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Disco.menu.pnum.STM32H573I_DK.openocd.target=stm32h5x
+Disco.menu.pnum.STM32H573I_DK.debug.server.openocd.scripts.2=target/stm32h5x.cfg
 Disco.menu.pnum.STM32H573I_DK.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H5xx/STM32H573.svd
 
 # STM32H747I-DISCO
@@ -1404,7 +1307,7 @@ Disco.menu.pnum.STM32H747I_DISCO.build.product_line=STM32H747xx
 Disco.menu.pnum.STM32H747I_DISCO.build.variant=STM32H7xx/H742X(G-I)H_H743X(G-I)H_H745X(G-I)H_H747X(G-I)H_H750XBH_H753XIH_H755XIH_H757XIH
 Disco.menu.pnum.STM32H747I_DISCO.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -DCORE_CM7
 Disco.menu.pnum.STM32H747I_DISCO.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Disco.menu.pnum.STM32H747I_DISCO.openocd.target=stm32h7x
+Disco.menu.pnum.STM32H747I_DISCO.debug.server.openocd.scripts.2=target/stm32h7x.cfg
 Disco.menu.pnum.STM32H747I_DISCO.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H747_CM7.svd
 
 # STM32WB5MM-DK board
@@ -1420,7 +1323,7 @@ Disco.menu.pnum.STM32WB5MM_DK.build.series=STM32WBxx
 Disco.menu.pnum.STM32WB5MM_DK.build.product_line=STM32WB5Mxx
 Disco.menu.pnum.STM32WB5MM_DK.build.variant=STM32WBxx/WB5MMGH
 Disco.menu.pnum.STM32WB5MM_DK.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Disco.menu.pnum.STM32WB5MM_DK.openocd.target=stm32wbx
+Disco.menu.pnum.STM32WB5MM_DK.debug.server.openocd.scripts.2=target/stm32wbx.cfg
 Disco.menu.pnum.STM32WB5MM_DK.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WBxx/STM32WB55_CM4.svd
 
 # Upload menu
@@ -1433,11 +1336,6 @@ Disco.menu.upload_method.swdMethod.upload.protocol=swd
 Disco.menu.upload_method.swdMethod.upload.options=
 Disco.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-Disco.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-Disco.menu.upload_method.jlinkMethod.upload.protocol=jlink
-Disco.menu.upload_method.jlinkMethod.upload.options=
-Disco.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 Disco.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 Disco.menu.upload_method.serialMethod.upload.protocol=serial
 Disco.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -1448,18 +1346,6 @@ Disco.menu.upload_method.dfuMethod.upload.protocol=dfu
 Disco.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 Disco.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-Disco.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-Disco.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-Disco.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-Disco.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-Disco.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-Disco.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-Disco.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-Disco.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-Disco.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # Eval boards
 
@@ -1502,7 +1388,7 @@ Eval.menu.pnum.STEVAL_MKSBOX1V1.build.series=STM32L4xx
 Eval.menu.pnum.STEVAL_MKSBOX1V1.build.product_line=STM32L4R9xx
 Eval.menu.pnum.STEVAL_MKSBOX1V1.build.variant=STM32L4xx/L4R9Z(G-I)J_L4S9ZIJ
 Eval.menu.pnum.STEVAL_MKSBOX1V1.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Eval.menu.pnum.STEVAL_MKSBOX1V1.openocd.target=stm32l4x
+Eval.menu.pnum.STEVAL_MKSBOX1V1.debug.server.openocd.scripts.2=target/stm32l4x.cfg
 Eval.menu.pnum.STEVAL_MKSBOX1V1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4R9.svd
 
 # STEVAL_MKBOXPRO board
@@ -1517,7 +1403,7 @@ Eval.menu.pnum.STEVAL_MKBOXPRO.build.series=STM32U5xx
 Eval.menu.pnum.STEVAL_MKBOXPRO.build.product_line=STM32U585xx
 Eval.menu.pnum.STEVAL_MKBOXPRO.build.variant=STM32U5xx/U575A(G-I)IxQ_U585AIIxQ
 Eval.menu.pnum.STEVAL_MKBOXPRO.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Eval.menu.pnum.STEVAL_MKBOXPRO.openocd.target=stm32u5x
+Eval.menu.pnum.STEVAL_MKBOXPRO.debug.server.openocd.scripts.2=target/stm32u5x.cfg
 Eval.menu.pnum.STEVAL_MKBOXPRO.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U5xx/STM32U585.svd
 
 # Upload menu
@@ -1526,28 +1412,11 @@ Eval.menu.upload_method.swdMethod.upload.protocol=swd
 Eval.menu.upload_method.swdMethod.upload.options=
 Eval.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-Eval.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-Eval.menu.upload_method.jlinkMethod.upload.protocol=jlink
-Eval.menu.upload_method.jlinkMethod.upload.options=
-Eval.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 Eval.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
 Eval.menu.upload_method.dfuMethod.upload.protocol=dfu
 Eval.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 Eval.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-Eval.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-Eval.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-Eval.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-Eval.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-Eval.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-Eval.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-Eval.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-Eval.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-Eval.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # STM32MP1 microprocessor series (MPU + MCU)
 
@@ -1601,7 +1470,7 @@ GenC0.build.st_extra_flags=-D{build.product_line} {build.xSerial} -D__CORTEX_SC=
 GenC0.build.flash_offset=0x0
 GenC0.upload.maximum_size=0
 GenC0.upload.maximum_data_size=0
-GenC0.openocd.target=stm32c0x
+GenC0.debug.server.openocd.scripts.2=target/stm32c0x.cfg
 
 # Generic C011D6Yx
 GenC0.menu.pnum.GENERIC_C011D6YX=Generic C011D6Yx
@@ -1720,52 +1589,17 @@ GenC0.menu.pnum.GENERIC_C031F6PX.build.product_line=STM32C031xx
 GenC0.menu.pnum.GENERIC_C031F6PX.build.variant=STM32C0xx/C011D6Y_C011F(4-6)(P-U)_C031F(4-6)P
 GenC0.menu.pnum.GENERIC_C031F6PX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32C0xx/STM32C031.svd
 
-# Generic C071R8Tx
-GenC0.menu.pnum.GENERIC_C071R8TX=Generic C071R8Tx
-GenC0.menu.pnum.GENERIC_C071R8TX.upload.maximum_size=65536
-GenC0.menu.pnum.GENERIC_C071R8TX.upload.maximum_data_size=24576
-GenC0.menu.pnum.GENERIC_C071R8TX.build.board=GENERIC_C071R8TX
-GenC0.menu.pnum.GENERIC_C071R8TX.build.product_line=STM32C071xx
-GenC0.menu.pnum.GENERIC_C071R8TX.build.variant=STM32C0xx/C071R(8-B)T
-GenC0.menu.pnum.GENERIC_C071R8TX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32C0xx/STM32C071.svd
-
-# Generic C071RBTx
-GenC0.menu.pnum.GENERIC_C071RBTX=Generic C071RBTx
-GenC0.menu.pnum.GENERIC_C071RBTX.upload.maximum_size=131072
-GenC0.menu.pnum.GENERIC_C071RBTX.upload.maximum_data_size=24576
-GenC0.menu.pnum.GENERIC_C071RBTX.build.board=GENERIC_C071RBTX
-GenC0.menu.pnum.GENERIC_C071RBTX.build.product_line=STM32C071xx
-GenC0.menu.pnum.GENERIC_C071RBTX.build.variant=STM32C0xx/C071R(8-B)T
-GenC0.menu.pnum.GENERIC_C071RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32C0xx/STM32C071.svd
-
 # Upload menu
 GenC0.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
 GenC0.menu.upload_method.swdMethod.upload.protocol=swd
 GenC0.menu.upload_method.swdMethod.upload.options=
 GenC0.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-GenC0.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-GenC0.menu.upload_method.jlinkMethod.upload.protocol=jlink
-GenC0.menu.upload_method.jlinkMethod.upload.options=
-GenC0.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 GenC0.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenC0.menu.upload_method.serialMethod.upload.protocol=serial
 GenC0.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 GenC0.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
-GenC0.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-GenC0.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-GenC0.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-GenC0.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-GenC0.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-GenC0.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-GenC0.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-GenC0.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-GenC0.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ###############################
 # Generic F0
 GenF0.name=Generic STM32F0 series
@@ -1778,7 +1612,7 @@ GenF0.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSer
 GenF0.build.flash_offset=0x0
 GenF0.upload.maximum_size=0
 GenF0.upload.maximum_data_size=0
-GenF0.openocd.target=stm32f0x
+GenF0.debug.server.openocd.scripts.2=target/stm32f0x.cfg
 GenF0.vid.0=0x0483
 GenF0.pid.0=0x5740
 
@@ -2082,6 +1916,15 @@ GenF0.menu.pnum.GENERIC_F042K6TX.build.product_line=STM32F042x6
 GenF0.menu.pnum.GENERIC_F042K6TX.build.variant=STM32F0xx/F042K(4-6)T
 GenF0.menu.pnum.GENERIC_F042K6TX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
 
+# Generic F042K6Ux
+GenF0.menu.pnum.GENERIC_F042K6UX=Generic F042K6Ux
+GenF0.menu.pnum.GENERIC_F042K6UX.upload.maximum_size=32768
+GenF0.menu.pnum.GENERIC_F042K6UX.upload.maximum_data_size=6144
+GenF0.menu.pnum.GENERIC_F042K6UX.build.board=GENERIC_F042K6UX
+GenF0.menu.pnum.GENERIC_F042K6UX.build.product_line=STM32F042x6
+GenF0.menu.pnum.GENERIC_F042K6UX.build.variant=STM32F0xx/F042K(4-6)U
+GenF0.menu.pnum.GENERIC_F042K6UX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
+
 # Generic F042T6Yx
 GenF0.menu.pnum.GENERIC_F042T6YX=Generic F042T6Yx
 GenF0.menu.pnum.GENERIC_F042T6YX.upload.maximum_size=32768
@@ -2664,11 +2507,6 @@ GenF0.menu.upload_method.swdMethod.upload.protocol=swd
 GenF0.menu.upload_method.swdMethod.upload.options=
 GenF0.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-GenF0.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-GenF0.menu.upload_method.jlinkMethod.upload.protocol=jlink
-GenF0.menu.upload_method.jlinkMethod.upload.options=
-GenF0.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 GenF0.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenF0.menu.upload_method.serialMethod.upload.protocol=serial
 GenF0.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -2679,18 +2517,6 @@ GenF0.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenF0.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenF0.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-GenF0.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-GenF0.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-GenF0.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-GenF0.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-GenF0.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-GenF0.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-GenF0.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-GenF0.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-GenF0.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # Generic F1
 GenF1.name=Generic STM32F1 series
@@ -2703,7 +2529,7 @@ GenF1.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSer
 GenF1.build.flash_offset=0x0
 GenF1.upload.maximum_size=0
 GenF1.upload.maximum_data_size=0
-GenF1.openocd.target=stm32f1x
+GenF1.debug.server.openocd.scripts.2=target/stm32f1x.cfg
 GenF1.vid.0=0x0483
 GenF1.pid.0=0x5740
 # DFU mode on built-in bootloader not available, assuming using STM32duino-bootloader
@@ -3501,11 +3327,6 @@ GenF1.menu.upload_method.swdMethod.upload.protocol=swd
 GenF1.menu.upload_method.swdMethod.upload.options=
 GenF1.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-GenF1.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-GenF1.menu.upload_method.jlinkMethod.upload.protocol=jlink
-GenF1.menu.upload_method.jlinkMethod.upload.options=
-GenF1.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 GenF1.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenF1.menu.upload_method.serialMethod.upload.protocol=serial
 GenF1.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -3540,14 +3361,6 @@ GenF1.menu.upload_method.dfuoMethod.upload.altID=1
 GenF1.menu.upload_method.dfuoMethod.build.flash_offset=0x5000
 GenF1.menu.upload_method.dfuoMethod.build.bootloader_flags=-DBL_LEGACY_LEAF
 
-GenF1.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-GenF1.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-GenF1.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-GenF1.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-GenF1.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-GenF1.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # Generic F2
 GenF2.name=Generic STM32F2 series
@@ -3560,7 +3373,7 @@ GenF2.build.series=STM32F2xx
 GenF2.build.flash_offset=0x0
 GenF2.upload.maximum_size=0
 GenF2.upload.maximum_data_size=0
-GenF2.openocd.target=stm32f2x
+GenF2.debug.server.openocd.scripts.2=target/stm32f2x.cfg
 GenF2.vid.0=0x0483
 GenF2.pid.0=0x5740
 
@@ -3993,11 +3806,6 @@ GenF2.menu.upload_method.swdMethod.upload.protocol=swd
 GenF2.menu.upload_method.swdMethod.upload.options=
 GenF2.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-GenF2.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-GenF2.menu.upload_method.jlinkMethod.upload.protocol=jlink
-GenF2.menu.upload_method.jlinkMethod.upload.options=
-GenF2.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 GenF2.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenF2.menu.upload_method.serialMethod.upload.protocol=serial
 GenF2.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -4008,18 +3816,6 @@ GenF2.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenF2.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenF2.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-GenF2.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-GenF2.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-GenF2.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-GenF2.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-GenF2.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-GenF2.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-GenF2.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-GenF2.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-GenF2.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # Generic F3
 
@@ -4035,7 +3831,7 @@ GenF3.build.series=STM32F3xx
 GenF3.build.flash_offset=0x0
 GenF3.upload.maximum_size=0
 GenF3.upload.maximum_data_size=0
-GenF3.openocd.target=stm32f3x
+GenF3.debug.server.openocd.scripts.2=target/stm32f3x.cfg
 GenF3.vid.0=0x0483
 GenF3.pid.0=0x5740
 
@@ -4461,11 +4257,6 @@ GenF3.menu.upload_method.swdMethod.upload.protocol=swd
 GenF3.menu.upload_method.swdMethod.upload.options=
 GenF3.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-GenF3.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-GenF3.menu.upload_method.jlinkMethod.upload.protocol=jlink
-GenF3.menu.upload_method.jlinkMethod.upload.options=
-GenF3.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 GenF3.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenF3.menu.upload_method.serialMethod.upload.protocol=serial
 GenF3.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -4480,14 +4271,6 @@ GenF3.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
 GenF3.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
 GenF3.menu.upload_method.bmpMethod.upload.tool=bmp_upload
 
-GenF3.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-GenF3.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-GenF3.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-GenF3.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-GenF3.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-GenF3.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # Generic F4
 
@@ -4503,7 +4286,7 @@ GenF4.build.series=STM32F4xx
 GenF4.build.flash_offset=0x0
 GenF4.upload.maximum_size=0
 GenF4.upload.maximum_data_size=0
-GenF4.openocd.target=stm32f4x
+GenF4.debug.server.openocd.scripts.2=target/stm32f4x.cfg
 GenF4.vid.0=0x0483
 GenF4.pid.0=0x5740
 
@@ -5483,11 +5266,6 @@ GenF4.menu.upload_method.swdMethod.upload.protocol=swd
 GenF4.menu.upload_method.swdMethod.upload.options=
 GenF4.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-GenF4.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-GenF4.menu.upload_method.jlinkMethod.upload.protocol=jlink
-GenF4.menu.upload_method.jlinkMethod.upload.options=
-GenF4.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 GenF4.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenF4.menu.upload_method.serialMethod.upload.protocol=serial
 GenF4.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -5508,14 +5286,6 @@ GenF4.menu.upload_method.hidMethod.upload.tool=hid_upload
 GenF4.menu.upload_method.hidMethod.build.flash_offset=0x4000
 GenF4.menu.upload_method.hidMethod.build.bootloader_flags=-DBL_HID
 
-GenF4.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-GenF4.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-GenF4.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-GenF4.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-GenF4.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-GenF4.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # Generic F7
 
@@ -5531,7 +5301,7 @@ GenF7.build.series=STM32F7xx
 GenF7.build.flash_offset=0x0
 GenF7.upload.maximum_size=0
 GenF7.upload.maximum_data_size=0
-GenF7.openocd.target=stm32f7x
+GenF7.debug.server.openocd.scripts.2=target/stm32f7x.cfg
 GenF7.vid.0=0x0483
 GenF7.pid.0=0x5740
 
@@ -6036,11 +5806,6 @@ GenF7.menu.upload_method.swdMethod.upload.protocol=swd
 GenF7.menu.upload_method.swdMethod.upload.options=
 GenF7.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-GenF7.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-GenF7.menu.upload_method.jlinkMethod.upload.protocol=jlink
-GenF7.menu.upload_method.jlinkMethod.upload.options=
-GenF7.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 GenF7.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenF7.menu.upload_method.serialMethod.upload.protocol=serial
 GenF7.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -6051,18 +5816,6 @@ GenF7.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenF7.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenF7.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-GenF7.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-GenF7.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-GenF7.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-GenF7.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-GenF7.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-GenF7.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-GenF7.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-GenF7.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-GenF7.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ###############################
 # Generic G0
 GenG0.name=Generic STM32G0 series
@@ -6075,7 +5828,7 @@ GenG0.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSer
 GenG0.build.flash_offset=0x0
 GenG0.upload.maximum_size=0
 GenG0.upload.maximum_data_size=0
-GenG0.openocd.target=stm32g0x
+GenG0.debug.server.openocd.scripts.2=target/stm32g0x.cfg
 GenG0.vid.0=0x0483
 GenG0.pid.0=0x5740
 
@@ -7464,11 +7217,6 @@ GenG0.menu.upload_method.swdMethod.upload.protocol=swd
 GenG0.menu.upload_method.swdMethod.upload.options=
 GenG0.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-GenG0.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-GenG0.menu.upload_method.jlinkMethod.upload.protocol=jlink
-GenG0.menu.upload_method.jlinkMethod.upload.options=
-GenG0.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 GenG0.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenG0.menu.upload_method.serialMethod.upload.protocol=serial
 GenG0.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -7479,18 +7227,6 @@ GenG0.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenG0.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenG0.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-GenG0.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-GenG0.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-GenG0.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-GenG0.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-GenG0.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-GenG0.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-GenG0.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-GenG0.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-GenG0.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ###############################
 # Generic G4
 GenG4.name=Generic STM32G4 series
@@ -7505,20 +7241,10 @@ GenG4.build.series=STM32G4xx
 GenG4.build.flash_offset=0x0
 GenG4.upload.maximum_size=0
 GenG4.upload.maximum_data_size=0
-GenG4.openocd.target=stm32g4x
+GenG4.debug.server.openocd.scripts.2=target/stm32g4x.cfg
 GenG4.vid.0=0x0483
 GenG4.pid.0=0x5740
 
-# WEACT_G474CE board
-GenG4.menu.pnum.WEACT_G474CE=WeAct G474CE
-GenG4.menu.pnum.WEACT_G474CE.upload.maximum_size=524288
-GenG4.menu.pnum.WEACT_G474CE.upload.maximum_data_size=131072
-GenG4.menu.pnum.WEACT_G474CE.build.board=WEACT_G474CE
-GenG4.menu.pnum.WEACT_G474CE.build.product_line=STM32G474xx
-GenG4.menu.pnum.WEACT_G474CE.build.variant=STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU
-GenG4.menu.pnum.WEACT_G474CE.build.variant_h=variant_{build.board}.h
-GenG4.menu.pnum.WEACT_G474CE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
-
 # Generic G431C6Tx
 GenG4.menu.pnum.GENERIC_G431C6TX=Generic G431C6Tx
 GenG4.menu.pnum.GENERIC_G431C6TX.upload.maximum_size=32768
@@ -7660,7 +7386,7 @@ GenG4.menu.pnum.GENERIC_G431R6IX.upload.maximum_size=32768
 GenG4.menu.pnum.GENERIC_G431R6IX.upload.maximum_data_size=32768
 GenG4.menu.pnum.GENERIC_G431R6IX.build.board=GENERIC_G431R6IX
 GenG4.menu.pnum.GENERIC_G431R6IX.build.product_line=STM32G431xx
-GenG4.menu.pnum.GENERIC_G431R6IX.build.variant=STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)
+GenG4.menu.pnum.GENERIC_G431R6IX.build.variant=STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)
 GenG4.menu.pnum.GENERIC_G431R6IX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G431.svd
 
 # Generic G431R8Ix
@@ -7669,7 +7395,7 @@ GenG4.menu.pnum.GENERIC_G431R8IX.upload.maximum_size=65536
 GenG4.menu.pnum.GENERIC_G431R8IX.upload.maximum_data_size=32768
 GenG4.menu.pnum.GENERIC_G431R8IX.build.board=GENERIC_G431R8IX
 GenG4.menu.pnum.GENERIC_G431R8IX.build.product_line=STM32G431xx
-GenG4.menu.pnum.GENERIC_G431R8IX.build.variant=STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)
+GenG4.menu.pnum.GENERIC_G431R8IX.build.variant=STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)
 GenG4.menu.pnum.GENERIC_G431R8IX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G431.svd
 
 # Generic G431RBIx
@@ -7678,7 +7404,7 @@ GenG4.menu.pnum.GENERIC_G431RBIX.upload.maximum_size=131072
 GenG4.menu.pnum.GENERIC_G431RBIX.upload.maximum_data_size=32768
 GenG4.menu.pnum.GENERIC_G431RBIX.build.board=GENERIC_G431RBIX
 GenG4.menu.pnum.GENERIC_G431RBIX.build.product_line=STM32G431xx
-GenG4.menu.pnum.GENERIC_G431RBIX.build.variant=STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)
+GenG4.menu.pnum.GENERIC_G431RBIX.build.variant=STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)
 GenG4.menu.pnum.GENERIC_G431RBIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G431.svd
 
 # Generic G431R6Tx
@@ -7687,7 +7413,7 @@ GenG4.menu.pnum.GENERIC_G431R6TX.upload.maximum_size=32768
 GenG4.menu.pnum.GENERIC_G431R6TX.upload.maximum_data_size=32768
 GenG4.menu.pnum.GENERIC_G431R6TX.build.board=GENERIC_G431R6TX
 GenG4.menu.pnum.GENERIC_G431R6TX.build.product_line=STM32G431xx
-GenG4.menu.pnum.GENERIC_G431R6TX.build.variant=STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)
+GenG4.menu.pnum.GENERIC_G431R6TX.build.variant=STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)
 GenG4.menu.pnum.GENERIC_G431R6TX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G431.svd
 
 # Generic G431R8Tx
@@ -7696,7 +7422,7 @@ GenG4.menu.pnum.GENERIC_G431R8TX.upload.maximum_size=65536
 GenG4.menu.pnum.GENERIC_G431R8TX.upload.maximum_data_size=32768
 GenG4.menu.pnum.GENERIC_G431R8TX.build.board=GENERIC_G431R8TX
 GenG4.menu.pnum.GENERIC_G431R8TX.build.product_line=STM32G431xx
-GenG4.menu.pnum.GENERIC_G431R8TX.build.variant=STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)
+GenG4.menu.pnum.GENERIC_G431R8TX.build.variant=STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)
 GenG4.menu.pnum.GENERIC_G431R8TX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G431.svd
 
 # Generic G431RBTx
@@ -7705,18 +7431,9 @@ GenG4.menu.pnum.GENERIC_G431RBTX.upload.maximum_size=131072
 GenG4.menu.pnum.GENERIC_G431RBTX.upload.maximum_data_size=32768
 GenG4.menu.pnum.GENERIC_G431RBTX.build.board=GENERIC_G431RBTX
 GenG4.menu.pnum.GENERIC_G431RBTX.build.product_line=STM32G431xx
-GenG4.menu.pnum.GENERIC_G431RBTX.build.variant=STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)
+GenG4.menu.pnum.GENERIC_G431RBTX.build.variant=STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)
 GenG4.menu.pnum.GENERIC_G431RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G431.svd
 
-# Generic G431RBTxZ
-GenG4.menu.pnum.GENERIC_G431RBTXZ=Generic G431RBTxZ
-GenG4.menu.pnum.GENERIC_G431RBTXZ.upload.maximum_size=131072
-GenG4.menu.pnum.GENERIC_G431RBTXZ.upload.maximum_data_size=32768
-GenG4.menu.pnum.GENERIC_G431RBTXZ.build.board=GENERIC_G431RBTXZ
-GenG4.menu.pnum.GENERIC_G431RBTXZ.build.product_line=STM32G431xx
-GenG4.menu.pnum.GENERIC_G431RBTXZ.build.variant=STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)
-GenG4.menu.pnum.GENERIC_G431RBTXZ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G431.svd
-
 # Generic G431V6Tx
 GenG4.menu.pnum.GENERIC_G431V6TX=Generic G431V6Tx
 GenG4.menu.pnum.GENERIC_G431V6TX.upload.maximum_size=32768
@@ -7795,7 +7512,7 @@ GenG4.menu.pnum.GENERIC_G441RBIX.upload.maximum_size=131072
 GenG4.menu.pnum.GENERIC_G441RBIX.upload.maximum_data_size=32768
 GenG4.menu.pnum.GENERIC_G441RBIX.build.board=GENERIC_G441RBIX
 GenG4.menu.pnum.GENERIC_G441RBIX.build.product_line=STM32G441xx
-GenG4.menu.pnum.GENERIC_G441RBIX.build.variant=STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)
+GenG4.menu.pnum.GENERIC_G441RBIX.build.variant=STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)
 GenG4.menu.pnum.GENERIC_G441RBIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G441.svd
 
 # Generic G441RBTx
@@ -7804,7 +7521,7 @@ GenG4.menu.pnum.GENERIC_G441RBTX.upload.maximum_size=131072
 GenG4.menu.pnum.GENERIC_G441RBTX.upload.maximum_data_size=32768
 GenG4.menu.pnum.GENERIC_G441RBTX.build.board=GENERIC_G441RBTX
 GenG4.menu.pnum.GENERIC_G441RBTX.build.product_line=STM32G441xx
-GenG4.menu.pnum.GENERIC_G441RBTX.build.variant=STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)
+GenG4.menu.pnum.GENERIC_G441RBTX.build.variant=STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)
 GenG4.menu.pnum.GENERIC_G441RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G441.svd
 
 # Generic G441VBTx
@@ -7951,15 +7668,6 @@ GenG4.menu.pnum.GENERIC_G473CBTX.build.product_line=STM32G473xx
 GenG4.menu.pnum.GENERIC_G473CBTX.build.variant=STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET
 GenG4.menu.pnum.GENERIC_G473CBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
 
-# Generic G473CBUx
-GenG4.menu.pnum.GENERIC_G473CBUX=Generic G473CBUx
-GenG4.menu.pnum.GENERIC_G473CBUX.upload.maximum_size=131072
-GenG4.menu.pnum.GENERIC_G473CBUX.upload.maximum_data_size=131072
-GenG4.menu.pnum.GENERIC_G473CBUX.build.board=GENERIC_G473CBUX
-GenG4.menu.pnum.GENERIC_G473CBUX.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473CBUX.build.variant=STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU
-GenG4.menu.pnum.GENERIC_G473CBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
-
 # Generic G473CCTx
 GenG4.menu.pnum.GENERIC_G473CCTX=Generic G473CCTx
 GenG4.menu.pnum.GENERIC_G473CCTX.upload.maximum_size=262144
@@ -7969,15 +7677,6 @@ GenG4.menu.pnum.GENERIC_G473CCTX.build.product_line=STM32G473xx
 GenG4.menu.pnum.GENERIC_G473CCTX.build.variant=STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET
 GenG4.menu.pnum.GENERIC_G473CCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
 
-# Generic G473CCUx
-GenG4.menu.pnum.GENERIC_G473CCUX=Generic G473CCUx
-GenG4.menu.pnum.GENERIC_G473CCUX.upload.maximum_size=262144
-GenG4.menu.pnum.GENERIC_G473CCUX.upload.maximum_data_size=131072
-GenG4.menu.pnum.GENERIC_G473CCUX.build.board=GENERIC_G473CCUX
-GenG4.menu.pnum.GENERIC_G473CCUX.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473CCUX.build.variant=STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU
-GenG4.menu.pnum.GENERIC_G473CCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
-
 # Generic G473CETx
 GenG4.menu.pnum.GENERIC_G473CETX=Generic G473CETx
 GenG4.menu.pnum.GENERIC_G473CETX.upload.maximum_size=524288
@@ -7987,15 +7686,6 @@ GenG4.menu.pnum.GENERIC_G473CETX.build.product_line=STM32G473xx
 GenG4.menu.pnum.GENERIC_G473CETX.build.variant=STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET
 GenG4.menu.pnum.GENERIC_G473CETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
 
-# Generic G473CEUx
-GenG4.menu.pnum.GENERIC_G473CEUX=Generic G473CEUx
-GenG4.menu.pnum.GENERIC_G473CEUX.upload.maximum_size=524288
-GenG4.menu.pnum.GENERIC_G473CEUX.upload.maximum_data_size=131072
-GenG4.menu.pnum.GENERIC_G473CEUX.build.board=GENERIC_G473CEUX
-GenG4.menu.pnum.GENERIC_G473CEUX.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473CEUX.build.variant=STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU
-GenG4.menu.pnum.GENERIC_G473CEUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
-
 # Generic G473MBTx
 GenG4.menu.pnum.GENERIC_G473MBTX=Generic G473MBTx
 GenG4.menu.pnum.GENERIC_G473MBTX.upload.maximum_size=131072
@@ -8056,7 +7746,7 @@ GenG4.menu.pnum.GENERIC_G473RBTX.upload.maximum_size=131072
 GenG4.menu.pnum.GENERIC_G473RBTX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G473RBTX.build.board=GENERIC_G473RBTX
 GenG4.menu.pnum.GENERIC_G473RBTX.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473RBTX.build.variant=STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET
+GenG4.menu.pnum.GENERIC_G473RBTX.build.variant=STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET
 GenG4.menu.pnum.GENERIC_G473RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
 
 # Generic G473RCTx
@@ -8065,7 +7755,7 @@ GenG4.menu.pnum.GENERIC_G473RCTX.upload.maximum_size=262144
 GenG4.menu.pnum.GENERIC_G473RCTX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G473RCTX.build.board=GENERIC_G473RCTX
 GenG4.menu.pnum.GENERIC_G473RCTX.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473RCTX.build.variant=STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET
+GenG4.menu.pnum.GENERIC_G473RCTX.build.variant=STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET
 GenG4.menu.pnum.GENERIC_G473RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
 
 # Generic G473RETx
@@ -8074,7 +7764,7 @@ GenG4.menu.pnum.GENERIC_G473RETX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G473RETX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G473RETX.build.board=GENERIC_G473RETX
 GenG4.menu.pnum.GENERIC_G473RETX.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473RETX.build.variant=STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET
+GenG4.menu.pnum.GENERIC_G473RETX.build.variant=STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET
 GenG4.menu.pnum.GENERIC_G473RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
 
 # Generic G473QBTx
@@ -8083,7 +7773,7 @@ GenG4.menu.pnum.GENERIC_G473QBTX.upload.maximum_size=131072
 GenG4.menu.pnum.GENERIC_G473QBTX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G473QBTX.build.board=GENERIC_G473QBTX
 GenG4.menu.pnum.GENERIC_G473QBTX.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473QBTX.build.variant=STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET
+GenG4.menu.pnum.GENERIC_G473QBTX.build.variant=STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET
 GenG4.menu.pnum.GENERIC_G473QBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
 
 # Generic G473QCTx
@@ -8092,7 +7782,7 @@ GenG4.menu.pnum.GENERIC_G473QCTX.upload.maximum_size=262144
 GenG4.menu.pnum.GENERIC_G473QCTX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G473QCTX.build.board=GENERIC_G473QCTX
 GenG4.menu.pnum.GENERIC_G473QCTX.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473QCTX.build.variant=STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET
+GenG4.menu.pnum.GENERIC_G473QCTX.build.variant=STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET
 GenG4.menu.pnum.GENERIC_G473QCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
 
 # Generic G473QETx
@@ -8101,18 +7791,9 @@ GenG4.menu.pnum.GENERIC_G473QETX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G473QETX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G473QETX.build.board=GENERIC_G473QETX
 GenG4.menu.pnum.GENERIC_G473QETX.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473QETX.build.variant=STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET
+GenG4.menu.pnum.GENERIC_G473QETX.build.variant=STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET
 GenG4.menu.pnum.GENERIC_G473QETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
 
-# Generic G473QETxZ
-GenG4.menu.pnum.GENERIC_G473QETXZ=Generic G473QETxZ
-GenG4.menu.pnum.GENERIC_G473QETXZ.upload.maximum_size=524288
-GenG4.menu.pnum.GENERIC_G473QETXZ.upload.maximum_data_size=131072
-GenG4.menu.pnum.GENERIC_G473QETXZ.build.board=GENERIC_G473QETXZ
-GenG4.menu.pnum.GENERIC_G473QETXZ.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473QETXZ.build.variant=STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET
-GenG4.menu.pnum.GENERIC_G473QETXZ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
-
 # Generic G473VBHx
 GenG4.menu.pnum.GENERIC_G473VBHX=Generic G473VBHx
 GenG4.menu.pnum.GENERIC_G473VBHX.upload.maximum_size=131072
@@ -8176,15 +7857,6 @@ GenG4.menu.pnum.GENERIC_G474CBTX.build.product_line=STM32G474xx
 GenG4.menu.pnum.GENERIC_G474CBTX.build.variant=STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET
 GenG4.menu.pnum.GENERIC_G474CBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
 
-# Generic G474CBUx
-GenG4.menu.pnum.GENERIC_G474CBUX=Generic G474CBUx
-GenG4.menu.pnum.GENERIC_G474CBUX.upload.maximum_size=131072
-GenG4.menu.pnum.GENERIC_G474CBUX.upload.maximum_data_size=131072
-GenG4.menu.pnum.GENERIC_G474CBUX.build.board=GENERIC_G474CBUX
-GenG4.menu.pnum.GENERIC_G474CBUX.build.product_line=STM32G474xx
-GenG4.menu.pnum.GENERIC_G474CBUX.build.variant=STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU
-GenG4.menu.pnum.GENERIC_G474CBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
-
 # Generic G474CCTx
 GenG4.menu.pnum.GENERIC_G474CCTX=Generic G474CCTx
 GenG4.menu.pnum.GENERIC_G474CCTX.upload.maximum_size=262144
@@ -8194,15 +7866,6 @@ GenG4.menu.pnum.GENERIC_G474CCTX.build.product_line=STM32G474xx
 GenG4.menu.pnum.GENERIC_G474CCTX.build.variant=STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET
 GenG4.menu.pnum.GENERIC_G474CCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
 
-# Generic G474CCUx
-GenG4.menu.pnum.GENERIC_G474CCUX=Generic G474CCUx
-GenG4.menu.pnum.GENERIC_G474CCUX.upload.maximum_size=262144
-GenG4.menu.pnum.GENERIC_G474CCUX.upload.maximum_data_size=131072
-GenG4.menu.pnum.GENERIC_G474CCUX.build.board=GENERIC_G474CCUX
-GenG4.menu.pnum.GENERIC_G474CCUX.build.product_line=STM32G474xx
-GenG4.menu.pnum.GENERIC_G474CCUX.build.variant=STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU
-GenG4.menu.pnum.GENERIC_G474CCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
-
 # Generic G474CETx
 GenG4.menu.pnum.GENERIC_G474CETX=Generic G474CETx
 GenG4.menu.pnum.GENERIC_G474CETX.upload.maximum_size=524288
@@ -8212,15 +7875,6 @@ GenG4.menu.pnum.GENERIC_G474CETX.build.product_line=STM32G474xx
 GenG4.menu.pnum.GENERIC_G474CETX.build.variant=STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET
 GenG4.menu.pnum.GENERIC_G474CETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
 
-# Generic G474CEUx
-GenG4.menu.pnum.GENERIC_G474CEUX=Generic G474CEUx
-GenG4.menu.pnum.GENERIC_G474CEUX.upload.maximum_size=524288
-GenG4.menu.pnum.GENERIC_G474CEUX.upload.maximum_data_size=131072
-GenG4.menu.pnum.GENERIC_G474CEUX.build.board=GENERIC_G474CEUX
-GenG4.menu.pnum.GENERIC_G474CEUX.build.product_line=STM32G474xx
-GenG4.menu.pnum.GENERIC_G474CEUX.build.variant=STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU
-GenG4.menu.pnum.GENERIC_G474CEUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
-
 # Generic G474MBTx
 GenG4.menu.pnum.GENERIC_G474MBTX=Generic G474MBTx
 GenG4.menu.pnum.GENERIC_G474MBTX.upload.maximum_size=131072
@@ -8281,7 +7935,7 @@ GenG4.menu.pnum.GENERIC_G474RBTX.upload.maximum_size=131072
 GenG4.menu.pnum.GENERIC_G474RBTX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G474RBTX.build.board=GENERIC_G474RBTX
 GenG4.menu.pnum.GENERIC_G474RBTX.build.product_line=STM32G474xx
-GenG4.menu.pnum.GENERIC_G474RBTX.build.variant=STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET
+GenG4.menu.pnum.GENERIC_G474RBTX.build.variant=STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET
 GenG4.menu.pnum.GENERIC_G474RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
 
 # Generic G474RCTx
@@ -8290,7 +7944,7 @@ GenG4.menu.pnum.GENERIC_G474RCTX.upload.maximum_size=262144
 GenG4.menu.pnum.GENERIC_G474RCTX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G474RCTX.build.board=GENERIC_G474RCTX
 GenG4.menu.pnum.GENERIC_G474RCTX.build.product_line=STM32G474xx
-GenG4.menu.pnum.GENERIC_G474RCTX.build.variant=STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET
+GenG4.menu.pnum.GENERIC_G474RCTX.build.variant=STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET
 GenG4.menu.pnum.GENERIC_G474RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
 
 # Generic G474RETx
@@ -8299,25 +7953,16 @@ GenG4.menu.pnum.GENERIC_G474RETX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G474RETX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G474RETX.build.board=GENERIC_G474RETX
 GenG4.menu.pnum.GENERIC_G474RETX.build.product_line=STM32G474xx
-GenG4.menu.pnum.GENERIC_G474RETX.build.variant=STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET
+GenG4.menu.pnum.GENERIC_G474RETX.build.variant=STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET
 GenG4.menu.pnum.GENERIC_G474RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
 
-# Generic G473RETxZ
-GenG4.menu.pnum.GENERIC_G473RETXZ=Generic G473RETxZ
-GenG4.menu.pnum.GENERIC_G473RETXZ.upload.maximum_size=524288
-GenG4.menu.pnum.GENERIC_G473RETXZ.upload.maximum_data_size=131072
-GenG4.menu.pnum.GENERIC_G473RETXZ.build.board=GENERIC_G473RETXZ
-GenG4.menu.pnum.GENERIC_G473RETXZ.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473RETXZ.build.variant=STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET
-GenG4.menu.pnum.GENERIC_G473RETXZ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
-
 # Generic G474QBTx
 GenG4.menu.pnum.GENERIC_G474QBTX=Generic G474QBTx
 GenG4.menu.pnum.GENERIC_G474QBTX.upload.maximum_size=131072
 GenG4.menu.pnum.GENERIC_G474QBTX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G474QBTX.build.board=GENERIC_G474QBTX
 GenG4.menu.pnum.GENERIC_G474QBTX.build.product_line=STM32G474xx
-GenG4.menu.pnum.GENERIC_G474QBTX.build.variant=STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET
+GenG4.menu.pnum.GENERIC_G474QBTX.build.variant=STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET
 GenG4.menu.pnum.GENERIC_G474QBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
 
 # Generic G474QCTx
@@ -8326,7 +7971,7 @@ GenG4.menu.pnum.GENERIC_G474QCTX.upload.maximum_size=262144
 GenG4.menu.pnum.GENERIC_G474QCTX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G474QCTX.build.board=GENERIC_G474QCTX
 GenG4.menu.pnum.GENERIC_G474QCTX.build.product_line=STM32G474xx
-GenG4.menu.pnum.GENERIC_G474QCTX.build.variant=STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET
+GenG4.menu.pnum.GENERIC_G474QCTX.build.variant=STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET
 GenG4.menu.pnum.GENERIC_G474QCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
 
 # Generic G474QETx
@@ -8335,7 +7980,7 @@ GenG4.menu.pnum.GENERIC_G474QETX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G474QETX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G474QETX.build.board=GENERIC_G474QETX
 GenG4.menu.pnum.GENERIC_G474QETX.build.product_line=STM32G474xx
-GenG4.menu.pnum.GENERIC_G474QETX.build.variant=STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET
+GenG4.menu.pnum.GENERIC_G474QETX.build.variant=STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET
 GenG4.menu.pnum.GENERIC_G474QETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
 
 # Generic G474VBHx
@@ -8401,15 +8046,6 @@ GenG4.menu.pnum.GENERIC_G483CETX.build.product_line=STM32G483xx
 GenG4.menu.pnum.GENERIC_G483CETX.build.variant=STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET
 GenG4.menu.pnum.GENERIC_G483CETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G483.svd
 
-# Generic G483CEUx
-GenG4.menu.pnum.GENERIC_G483CEUX=Generic G483CEUx
-GenG4.menu.pnum.GENERIC_G483CEUX.upload.maximum_size=524288
-GenG4.menu.pnum.GENERIC_G483CEUX.upload.maximum_data_size=131072
-GenG4.menu.pnum.GENERIC_G483CEUX.build.board=GENERIC_G483CEUX
-GenG4.menu.pnum.GENERIC_G483CEUX.build.product_line=STM32G483xx
-GenG4.menu.pnum.GENERIC_G483CEUX.build.variant=STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU
-GenG4.menu.pnum.GENERIC_G483CEUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G483.svd
-
 # Generic G483METx
 GenG4.menu.pnum.GENERIC_G483METX=Generic G483METx
 GenG4.menu.pnum.GENERIC_G483METX.upload.maximum_size=524288
@@ -8434,7 +8070,7 @@ GenG4.menu.pnum.GENERIC_G483RETX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G483RETX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G483RETX.build.board=GENERIC_G483RETX
 GenG4.menu.pnum.GENERIC_G483RETX.build.product_line=STM32G483xx
-GenG4.menu.pnum.GENERIC_G483RETX.build.variant=STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET
+GenG4.menu.pnum.GENERIC_G483RETX.build.variant=STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET
 GenG4.menu.pnum.GENERIC_G483RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G483.svd
 
 # Generic G483QETx
@@ -8443,7 +8079,7 @@ GenG4.menu.pnum.GENERIC_G483QETX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G483QETX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G483QETX.build.board=GENERIC_G483QETX
 GenG4.menu.pnum.GENERIC_G483QETX.build.product_line=STM32G483xx
-GenG4.menu.pnum.GENERIC_G483QETX.build.variant=STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET
+GenG4.menu.pnum.GENERIC_G483QETX.build.variant=STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET
 GenG4.menu.pnum.GENERIC_G483QETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G483.svd
 
 # Generic G483VEHx
@@ -8473,15 +8109,6 @@ GenG4.menu.pnum.GENERIC_G484CETX.build.product_line=STM32G484xx
 GenG4.menu.pnum.GENERIC_G484CETX.build.variant=STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET
 GenG4.menu.pnum.GENERIC_G484CETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G484.svd
 
-# Generic G484CEUx
-GenG4.menu.pnum.GENERIC_G484CEUX=Generic G484CEUx
-GenG4.menu.pnum.GENERIC_G484CEUX.upload.maximum_size=524288
-GenG4.menu.pnum.GENERIC_G484CEUX.upload.maximum_data_size=131072
-GenG4.menu.pnum.GENERIC_G484CEUX.build.board=GENERIC_G484CEUX
-GenG4.menu.pnum.GENERIC_G484CEUX.build.product_line=STM32G484xx
-GenG4.menu.pnum.GENERIC_G484CEUX.build.variant=STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU
-GenG4.menu.pnum.GENERIC_G484CEUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G484.svd
-
 # Generic G484METx
 GenG4.menu.pnum.GENERIC_G484METX=Generic G484METx
 GenG4.menu.pnum.GENERIC_G484METX.upload.maximum_size=524288
@@ -8506,7 +8133,7 @@ GenG4.menu.pnum.GENERIC_G484QETX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G484QETX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G484QETX.build.board=GENERIC_G484QETX
 GenG4.menu.pnum.GENERIC_G484QETX.build.product_line=STM32G484xx
-GenG4.menu.pnum.GENERIC_G484QETX.build.variant=STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET
+GenG4.menu.pnum.GENERIC_G484QETX.build.variant=STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET
 GenG4.menu.pnum.GENERIC_G484QETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G484.svd
 
 # Generic G484RETx
@@ -8515,7 +8142,7 @@ GenG4.menu.pnum.GENERIC_G484RETX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G484RETX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G484RETX.build.board=GENERIC_G484RETX
 GenG4.menu.pnum.GENERIC_G484RETX.build.product_line=STM32G484xx
-GenG4.menu.pnum.GENERIC_G484RETX.build.variant=STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET
+GenG4.menu.pnum.GENERIC_G484RETX.build.variant=STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET
 GenG4.menu.pnum.GENERIC_G484RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G484.svd
 
 # Generic G484VEHx
@@ -8536,6 +8163,15 @@ GenG4.menu.pnum.GENERIC_G484VETX.build.product_line=STM32G484xx
 GenG4.menu.pnum.GENERIC_G484VETX.build.variant=STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)
 GenG4.menu.pnum.GENERIC_G484VETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G484.svd
 
+# Generic G484QETx
+GenG4.menu.pnum.GENERIC_G484QETX=Generic G484QETx
+GenG4.menu.pnum.GENERIC_G484QETX.upload.maximum_size=524288
+GenG4.menu.pnum.GENERIC_G484QETX.upload.maximum_data_size=131072
+GenG4.menu.pnum.GENERIC_G484QETX.build.board=GENERIC_G484QETX
+GenG4.menu.pnum.GENERIC_G484QETX.build.product_line=STM32G484xx
+GenG4.menu.pnum.GENERIC_G484QETX.build.variant=STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET
+GenG4.menu.pnum.GENERIC_G484QETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G484.svd
+
 # Generic G491CCTx
 GenG4.menu.pnum.GENERIC_G491CCTX=Generic G491CCTx
 GenG4.menu.pnum.GENERIC_G491CCTX.upload.maximum_size=262144
@@ -8614,7 +8250,7 @@ GenG4.menu.pnum.GENERIC_G491RCIX.upload.maximum_size=262144
 GenG4.menu.pnum.GENERIC_G491RCIX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G491RCIX.build.board=GENERIC_G491RCIX
 GenG4.menu.pnum.GENERIC_G491RCIX.build.product_line=STM32G491xx
-GenG4.menu.pnum.GENERIC_G491RCIX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)
+GenG4.menu.pnum.GENERIC_G491RCIX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)
 GenG4.menu.pnum.GENERIC_G491RCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G491.svd
 
 # Generic G491REIx
@@ -8623,7 +8259,7 @@ GenG4.menu.pnum.GENERIC_G491REIX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G491REIX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G491REIX.build.board=GENERIC_G491REIX
 GenG4.menu.pnum.GENERIC_G491REIX.build.product_line=STM32G491xx
-GenG4.menu.pnum.GENERIC_G491REIX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)
+GenG4.menu.pnum.GENERIC_G491REIX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)
 GenG4.menu.pnum.GENERIC_G491REIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G491.svd
 
 # Generic G491RCTx
@@ -8632,7 +8268,7 @@ GenG4.menu.pnum.GENERIC_G491RCTX.upload.maximum_size=262144
 GenG4.menu.pnum.GENERIC_G491RCTX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G491RCTX.build.board=GENERIC_G491RCTX
 GenG4.menu.pnum.GENERIC_G491RCTX.build.product_line=STM32G491xx
-GenG4.menu.pnum.GENERIC_G491RCTX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)
+GenG4.menu.pnum.GENERIC_G491RCTX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)
 GenG4.menu.pnum.GENERIC_G491RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G491.svd
 
 # Generic G491RETx
@@ -8641,24 +8277,16 @@ GenG4.menu.pnum.GENERIC_G491RETX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G491RETX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G491RETX.build.board=GENERIC_G491RETX
 GenG4.menu.pnum.GENERIC_G491RETX.build.product_line=STM32G491xx
-GenG4.menu.pnum.GENERIC_G491RETX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)
+GenG4.menu.pnum.GENERIC_G491RETX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)
 GenG4.menu.pnum.GENERIC_G491RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G491.svd
 
-# Generic G491RETxZ
-GenG4.menu.pnum.GENERIC_G491RETXZ=Generic G491RETxZ
-GenG4.menu.pnum.GENERIC_G491RETXZ.upload.maximum_size=524288
-GenG4.menu.pnum.GENERIC_G491RETXZ.upload.maximum_data_size=131072
-GenG4.menu.pnum.GENERIC_G491RETXZ.build.board=GENERIC_G491RETXZ
-GenG4.menu.pnum.GENERIC_G491RETXZ.build.product_line=STM32G491xx
-GenG4.menu.pnum.GENERIC_G491RETXZ.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)
-
 # Generic G491REYx
 GenG4.menu.pnum.GENERIC_G491REYX=Generic G491REYx
 GenG4.menu.pnum.GENERIC_G491REYX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G491REYX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G491REYX.build.board=GENERIC_G491REYX
 GenG4.menu.pnum.GENERIC_G491REYX.build.product_line=STM32G491xx
-GenG4.menu.pnum.GENERIC_G491REYX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)
+GenG4.menu.pnum.GENERIC_G491REYX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)
 GenG4.menu.pnum.GENERIC_G491REYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G491.svd
 
 # Generic G491VCTx
@@ -8685,7 +8313,7 @@ GenG4.menu.pnum.GENERIC_G4A1REIX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G4A1REIX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G4A1REIX.build.board=GENERIC_G4A1REIX
 GenG4.menu.pnum.GENERIC_G4A1REIX.build.product_line=STM32G4A1xx
-GenG4.menu.pnum.GENERIC_G4A1REIX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)
+GenG4.menu.pnum.GENERIC_G4A1REIX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)
 GenG4.menu.pnum.GENERIC_G4A1REIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G4A1.svd
 
 # Generic G4A1CETx
@@ -8730,7 +8358,7 @@ GenG4.menu.pnum.GENERIC_G4A1RETX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G4A1RETX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G4A1RETX.build.board=GENERIC_G4A1RETX
 GenG4.menu.pnum.GENERIC_G4A1RETX.build.product_line=STM32G4A1xx
-GenG4.menu.pnum.GENERIC_G4A1RETX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)
+GenG4.menu.pnum.GENERIC_G4A1RETX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)
 GenG4.menu.pnum.GENERIC_G4A1RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G4A1.svd
 
 # Generic G4A1REYx
@@ -8739,7 +8367,7 @@ GenG4.menu.pnum.GENERIC_G4A1REYX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G4A1REYX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G4A1REYX.build.board=GENERIC_G4A1REYX
 GenG4.menu.pnum.GENERIC_G4A1REYX.build.product_line=STM32G4A1xx
-GenG4.menu.pnum.GENERIC_G4A1REYX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)
+GenG4.menu.pnum.GENERIC_G4A1REYX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)
 GenG4.menu.pnum.GENERIC_G4A1REYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G4A1.svd
 
 # Generic G4A1VETx
@@ -8757,11 +8385,6 @@ GenG4.menu.upload_method.swdMethod.upload.protocol=swd
 GenG4.menu.upload_method.swdMethod.upload.options=
 GenG4.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-GenG4.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-GenG4.menu.upload_method.jlinkMethod.upload.protocol=jlink
-GenG4.menu.upload_method.jlinkMethod.upload.options=
-GenG4.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 GenG4.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenG4.menu.upload_method.serialMethod.upload.protocol=serial
 GenG4.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -8772,18 +8395,6 @@ GenG4.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenG4.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenG4.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-GenG4.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-GenG4.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-GenG4.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-GenG4.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-GenG4.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-GenG4.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-GenG4.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-GenG4.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-GenG4.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # Generic H5
 GenH5.name=Generic STM32H5 series
@@ -8799,39 +8410,10 @@ GenH5.build.flash_offset=0x0
 GenH5.upload.maximum_size=0
 GenH5.upload.maximum_data_size=0
 # Current openocd version does not support H5
-# GenH5.openocd.target=stm32h5x
+# GenH5.debug.server.openocd.scripts.2=target/stm32h5x.cfg
 GenH5.vid.0=0x0483
 GenH5.pid.0=0x5740
 
-# WeAct H562RGT
-GenH5.menu.pnum.WEACT_H562RG=WeAct H562RGT
-GenH5.menu.pnum.WEACT_H562RG.upload.maximum_size=1048576
-GenH5.menu.pnum.WEACT_H562RG.upload.maximum_data_size=655360
-GenH5.menu.pnum.WEACT_H562RG.build.board=WEACT_H562RG
-GenH5.menu.pnum.WEACT_H562RG.build.product_line=STM32H562xx
-GenH5.menu.pnum.WEACT_H562RG.build.variant=STM32H5xx/H562R(G-I)T
-GenH5.menu.pnum.WEACT_H562RG.build.variant_h=variant_WEACT_H562RG.h
-GenH5.menu.pnum.WEACT_H562RG.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-GenH5.menu.pnum.WEACT_H562RG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H5xx/STM32H562.svd
-
-# Generic H503CBTx
-GenH5.menu.pnum.GENERIC_H503CBTX=Generic H503CBTx
-GenH5.menu.pnum.GENERIC_H503CBTX.upload.maximum_size=131072
-GenH5.menu.pnum.GENERIC_H503CBTX.upload.maximum_data_size=32768
-GenH5.menu.pnum.GENERIC_H503CBTX.build.board=GENERIC_H503CBTX
-GenH5.menu.pnum.GENERIC_H503CBTX.build.product_line=STM32H503xx
-GenH5.menu.pnum.GENERIC_H503CBTX.build.variant=STM32H5xx/H503CB(T-U)
-GenH5.menu.pnum.GENERIC_H503CBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H5xx/STM32H503.svd
-
-# Generic H503CBUx
-GenH5.menu.pnum.GENERIC_H503CBUX=Generic H503CBUx
-GenH5.menu.pnum.GENERIC_H503CBUX.upload.maximum_size=131072
-GenH5.menu.pnum.GENERIC_H503CBUX.upload.maximum_data_size=32768
-GenH5.menu.pnum.GENERIC_H503CBUX.build.board=GENERIC_H503CBUX
-GenH5.menu.pnum.GENERIC_H503CBUX.build.product_line=STM32H503xx
-GenH5.menu.pnum.GENERIC_H503CBUX.build.variant=STM32H5xx/H503CB(T-U)
-GenH5.menu.pnum.GENERIC_H503CBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H5xx/STM32H503.svd
-
 # Generic H503KBUx
 GenH5.menu.pnum.GENERIC_H503KBUX=Generic H503KBUx
 GenH5.menu.pnum.GENERIC_H503KBUX.upload.maximum_size=131072
@@ -8850,24 +8432,6 @@ GenH5.menu.pnum.GENERIC_H503RBTX.build.product_line=STM32H503xx
 GenH5.menu.pnum.GENERIC_H503RBTX.build.variant=STM32H5xx/H503RBT
 GenH5.menu.pnum.GENERIC_H503RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H5xx/STM32H503.svd
 
-# Generic H562RGTx
-GenH5.menu.pnum.GENERIC_H562RGTX=Generic H562RGTx
-GenH5.menu.pnum.GENERIC_H562RGTX.upload.maximum_size=1048576
-GenH5.menu.pnum.GENERIC_H562RGTX.upload.maximum_data_size=655360
-GenH5.menu.pnum.GENERIC_H562RGTX.build.board=GENERIC_H562RGTX
-GenH5.menu.pnum.GENERIC_H562RGTX.build.product_line=STM32H562xx
-GenH5.menu.pnum.GENERIC_H562RGTX.build.variant=STM32H5xx/H562R(G-I)T
-GenH5.menu.pnum.GENERIC_H562RGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H5xx/STM32H562.svd
-
-# Generic H562RITx
-GenH5.menu.pnum.GENERIC_H562RITX=Generic H562RITx
-GenH5.menu.pnum.GENERIC_H562RITX.upload.maximum_size=2097152
-GenH5.menu.pnum.GENERIC_H562RITX.upload.maximum_data_size=655360
-GenH5.menu.pnum.GENERIC_H562RITX.build.board=GENERIC_H562RITX
-GenH5.menu.pnum.GENERIC_H562RITX.build.product_line=STM32H562xx
-GenH5.menu.pnum.GENERIC_H562RITX.build.variant=STM32H5xx/H562R(G-I)T
-GenH5.menu.pnum.GENERIC_H562RITX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H5xx/STM32H562.svd
-
 # Generic H563IIKxQ
 GenH5.menu.pnum.GENERIC_H563IIKXQ=Generic H563IIKxQ
 GenH5.menu.pnum.GENERIC_H563IIKXQ.upload.maximum_size=2097152
@@ -8946,11 +8510,6 @@ GenH5.menu.upload_method.swdMethod.upload.protocol=swd
 GenH5.menu.upload_method.swdMethod.upload.options=
 GenH5.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-GenH5.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-GenH5.menu.upload_method.jlinkMethod.upload.protocol=jlink
-GenH5.menu.upload_method.jlinkMethod.upload.options=
-GenH5.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 GenH5.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenH5.menu.upload_method.serialMethod.upload.protocol=serial
 GenH5.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -8961,18 +8520,6 @@ GenH5.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenH5.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenH5.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-GenH5.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-GenH5.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-GenH5.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-#GenH5.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-#GenH5.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-#GenH5.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-#GenH5.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-#GenH5.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-#GenH5.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # Generic H7
 GenH7.name=Generic STM32H7 Series
@@ -8987,7 +8534,7 @@ GenH7.build.mcu=cortex-m7
 GenH7.build.flash_offset=0x0
 GenH7.upload.maximum_size=0
 GenH7.upload.maximum_data_size=0
-GenH7.openocd.target=stm32h7x
+GenH7.debug.server.openocd.scripts.2=target/stm32h7x.cfg
 GenH7.vid.0=0x0483
 GenH7.pid.0=0x5740
 
@@ -8998,7 +8545,7 @@ GenH7.menu.pnum.DAISY_SEED.upload.maximum_data_size=524288
 GenH7.menu.pnum.DAISY_SEED.build.board=DAISY_SEED
 GenH7.menu.pnum.DAISY_SEED.build.product_line=STM32H750xx
 GenH7.menu.pnum.DAISY_SEED.build.variant_h=variant_{build.board}.h
-GenH7.menu.pnum.DAISY_SEED.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
+GenH7.menu.pnum.DAISY_SEED.build.variant=STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK
 GenH7.menu.pnum.DAISY_SEED.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 GenH7.menu.pnum.DAISY_SEED.build.ldscript=DAISY_SEED.ld
 GenH7.menu.pnum.DAISY_SEED.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H750.svd
@@ -9010,7 +8557,7 @@ GenH7.menu.pnum.DAISY_PATCH_SM.upload.maximum_data_size=524288
 GenH7.menu.pnum.DAISY_PATCH_SM.build.board=DAISY_PATCH_SM
 GenH7.menu.pnum.DAISY_PATCH_SM.build.product_line=STM32H750xx
 GenH7.menu.pnum.DAISY_PATCH_SM.build.variant_h=variant_{build.board}.h
-GenH7.menu.pnum.DAISY_PATCH_SM.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
+GenH7.menu.pnum.DAISY_PATCH_SM.build.variant=STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK
 GenH7.menu.pnum.DAISY_PATCH_SM.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 GenH7.menu.pnum.DAISY_PATCH_SM.build.ldscript=DAISY_SEED.ld
 GenH7.menu.pnum.DAISY_PATCH_SM.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H750.svd
@@ -9022,7 +8569,7 @@ GenH7.menu.pnum.DAISY_PETAL_SM.upload.maximum_data_size=524288
 GenH7.menu.pnum.DAISY_PETAL_SM.build.board=DAISY_PETAL_SM
 GenH7.menu.pnum.DAISY_PETAL_SM.build.product_line=STM32H750xx
 GenH7.menu.pnum.DAISY_PETAL_SM.build.variant_h=variant_{build.board}.h
-GenH7.menu.pnum.DAISY_PETAL_SM.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
+GenH7.menu.pnum.DAISY_PETAL_SM.build.variant=STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK
 GenH7.menu.pnum.DAISY_PETAL_SM.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 GenH7.menu.pnum.DAISY_PETAL_SM.build.ldscript=DAISY_SEED.ld
 GenH7.menu.pnum.DAISY_PETAL_SM.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H750.svd
@@ -9113,7 +8660,7 @@ GenH7.menu.pnum.GENERIC_H742IGKX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H742IGKX.upload.maximum_data_size=524288
 GenH7.menu.pnum.GENERIC_H742IGKX.build.board=GENERIC_H742IGKX
 GenH7.menu.pnum.GENERIC_H742IGKX.build.product_line=STM32H742xx
-GenH7.menu.pnum.GENERIC_H742IGKX.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
+GenH7.menu.pnum.GENERIC_H742IGKX.build.variant=STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK
 GenH7.menu.pnum.GENERIC_H742IGKX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H742.svd
 
 # Generic H742IIKx
@@ -9122,7 +8669,7 @@ GenH7.menu.pnum.GENERIC_H742IIKX.upload.maximum_size=2097152
 GenH7.menu.pnum.GENERIC_H742IIKX.upload.maximum_data_size=524288
 GenH7.menu.pnum.GENERIC_H742IIKX.build.board=GENERIC_H742IIKX
 GenH7.menu.pnum.GENERIC_H742IIKX.build.product_line=STM32H742xx
-GenH7.menu.pnum.GENERIC_H742IIKX.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
+GenH7.menu.pnum.GENERIC_H742IIKX.build.variant=STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK
 GenH7.menu.pnum.GENERIC_H742IIKX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H742.svd
 
 # Generic H742IGTx
@@ -9131,7 +8678,7 @@ GenH7.menu.pnum.GENERIC_H742IGTX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H742IGTX.upload.maximum_data_size=524288
 GenH7.menu.pnum.GENERIC_H742IGTX.build.board=GENERIC_H742IGTX
 GenH7.menu.pnum.GENERIC_H742IGTX.build.product_line=STM32H742xx
-GenH7.menu.pnum.GENERIC_H742IGTX.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
+GenH7.menu.pnum.GENERIC_H742IGTX.build.variant=STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT
 GenH7.menu.pnum.GENERIC_H742IGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H742.svd
 
 # Generic H742IITx
@@ -9140,7 +8687,7 @@ GenH7.menu.pnum.GENERIC_H742IITX.upload.maximum_size=2097152
 GenH7.menu.pnum.GENERIC_H742IITX.upload.maximum_data_size=524288
 GenH7.menu.pnum.GENERIC_H742IITX.build.board=GENERIC_H742IITX
 GenH7.menu.pnum.GENERIC_H742IITX.build.product_line=STM32H742xx
-GenH7.menu.pnum.GENERIC_H742IITX.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
+GenH7.menu.pnum.GENERIC_H742IITX.build.variant=STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT
 GenH7.menu.pnum.GENERIC_H742IITX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H742.svd
 
 # Generic H742VGHx
@@ -9221,7 +8768,7 @@ GenH7.menu.pnum.GENERIC_H743IGKX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H743IGKX.upload.maximum_data_size=524288
 GenH7.menu.pnum.GENERIC_H743IGKX.build.board=GENERIC_H743IGKX
 GenH7.menu.pnum.GENERIC_H743IGKX.build.product_line=STM32H743xx
-GenH7.menu.pnum.GENERIC_H743IGKX.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
+GenH7.menu.pnum.GENERIC_H743IGKX.build.variant=STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK
 GenH7.menu.pnum.GENERIC_H743IGKX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H743.svd
 
 # Generic H743IGTx
@@ -9230,7 +8777,7 @@ GenH7.menu.pnum.GENERIC_H743IGTX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H743IGTX.upload.maximum_data_size=524288
 GenH7.menu.pnum.GENERIC_H743IGTX.build.board=GENERIC_H743IGTX
 GenH7.menu.pnum.GENERIC_H743IGTX.build.product_line=STM32H743xx
-GenH7.menu.pnum.GENERIC_H743IGTX.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
+GenH7.menu.pnum.GENERIC_H743IGTX.build.variant=STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT
 GenH7.menu.pnum.GENERIC_H743IGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H743.svd
 
 # Generic H743IIKx
@@ -9239,7 +8786,7 @@ GenH7.menu.pnum.GENERIC_H743IIKX.upload.maximum_size=2097152
 GenH7.menu.pnum.GENERIC_H743IIKX.upload.maximum_data_size=524288
 GenH7.menu.pnum.GENERIC_H743IIKX.build.board=GENERIC_H743IIKX
 GenH7.menu.pnum.GENERIC_H743IIKX.build.product_line=STM32H743xx
-GenH7.menu.pnum.GENERIC_H743IIKX.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
+GenH7.menu.pnum.GENERIC_H743IIKX.build.variant=STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK
 GenH7.menu.pnum.GENERIC_H743IIKX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H743.svd
 
 # Generic H743IITx
@@ -9248,7 +8795,7 @@ GenH7.menu.pnum.GENERIC_H743IITX.upload.maximum_size=2097152
 GenH7.menu.pnum.GENERIC_H743IITX.upload.maximum_data_size=524288
 GenH7.menu.pnum.GENERIC_H743IITX.build.board=GENERIC_H743IITX
 GenH7.menu.pnum.GENERIC_H743IITX.build.product_line=STM32H743xx
-GenH7.menu.pnum.GENERIC_H743IITX.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
+GenH7.menu.pnum.GENERIC_H743IITX.build.variant=STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT
 GenH7.menu.pnum.GENERIC_H743IITX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H743.svd
 
 # Generic H743VGHx
@@ -9401,7 +8948,7 @@ GenH7.menu.pnum.GENERIC_H750IBKX.upload.maximum_size=131072
 GenH7.menu.pnum.GENERIC_H750IBKX.upload.maximum_data_size=524288
 GenH7.menu.pnum.GENERIC_H750IBKX.build.board=GENERIC_H750IBKX
 GenH7.menu.pnum.GENERIC_H750IBKX.build.product_line=STM32H750xx
-GenH7.menu.pnum.GENERIC_H750IBKX.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
+GenH7.menu.pnum.GENERIC_H750IBKX.build.variant=STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK
 GenH7.menu.pnum.GENERIC_H750IBKX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H750.svd
 
 # Generic H750IBTx
@@ -9410,7 +8957,7 @@ GenH7.menu.pnum.GENERIC_H750IBTX.upload.maximum_size=131072
 GenH7.menu.pnum.GENERIC_H750IBTX.upload.maximum_data_size=524288
 GenH7.menu.pnum.GENERIC_H750IBTX.build.board=GENERIC_H750IBTX
 GenH7.menu.pnum.GENERIC_H750IBTX.build.product_line=STM32H750xx
-GenH7.menu.pnum.GENERIC_H750IBTX.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
+GenH7.menu.pnum.GENERIC_H750IBTX.build.variant=STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT
 GenH7.menu.pnum.GENERIC_H750IBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H750.svd
 
 # Generic H750VBTx
@@ -9446,7 +8993,7 @@ GenH7.menu.pnum.GENERIC_H753IIKX.upload.maximum_size=2097152
 GenH7.menu.pnum.GENERIC_H753IIKX.upload.maximum_data_size=524288
 GenH7.menu.pnum.GENERIC_H753IIKX.build.board=GENERIC_H753IIKX
 GenH7.menu.pnum.GENERIC_H753IIKX.build.product_line=STM32H753xx
-GenH7.menu.pnum.GENERIC_H753IIKX.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
+GenH7.menu.pnum.GENERIC_H753IIKX.build.variant=STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK
 GenH7.menu.pnum.GENERIC_H753IIKX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H753.svd
 
 # Generic H753IITx
@@ -9455,7 +9002,7 @@ GenH7.menu.pnum.GENERIC_H753IITX.upload.maximum_size=2097152
 GenH7.menu.pnum.GENERIC_H753IITX.upload.maximum_data_size=524288
 GenH7.menu.pnum.GENERIC_H753IITX.build.board=GENERIC_H753IITX
 GenH7.menu.pnum.GENERIC_H753IITX.build.product_line=STM32H753xx
-GenH7.menu.pnum.GENERIC_H753IITX.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
+GenH7.menu.pnum.GENERIC_H753IITX.build.variant=STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT
 GenH7.menu.pnum.GENERIC_H753IITX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H753.svd
 
 # Generic H753VIHx
@@ -9566,24 +9113,6 @@ GenH7.menu.pnum.GENERIC_H7A3VITX.build.product_line=STM32H7A3xx
 GenH7.menu.pnum.GENERIC_H7A3VITX.build.variant=STM32H7xx/H7A3V(G-I)(H-T)_H7B0VBT_H7B3VI(H-T)
 GenH7.menu.pnum.GENERIC_H7A3VITX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H7A3.svd
 
-# Generic H7A3ZGTxQ
-GenH7.menu.pnum.GENERIC_H7A3ZGTXQ=Generic H7A3ZGTxQ
-GenH7.menu.pnum.GENERIC_H7A3ZGTXQ.upload.maximum_size=1048576
-GenH7.menu.pnum.GENERIC_H7A3ZGTXQ.upload.maximum_data_size=1048576
-GenH7.menu.pnum.GENERIC_H7A3ZGTXQ.build.board=GENERIC_H7A3ZGTXQ
-GenH7.menu.pnum.GENERIC_H7A3ZGTXQ.build.product_line=STM32H7A3xxQ
-GenH7.menu.pnum.GENERIC_H7A3ZGTXQ.build.variant=STM32H7xx/H7A3Z(G-I)TxQ_H7B3ZITxQ
-GenH7.menu.pnum.GENERIC_H7A3ZGTXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H7A3.svd
-
-# Generic H7A3ZITxQ
-GenH7.menu.pnum.GENERIC_H7A3ZITXQ=Generic H7A3ZITxQ
-GenH7.menu.pnum.GENERIC_H7A3ZITXQ.upload.maximum_size=2097152
-GenH7.menu.pnum.GENERIC_H7A3ZITXQ.upload.maximum_data_size=1048576
-GenH7.menu.pnum.GENERIC_H7A3ZITXQ.build.board=GENERIC_H7A3ZITXQ
-GenH7.menu.pnum.GENERIC_H7A3ZITXQ.build.product_line=STM32H7A3xxQ
-GenH7.menu.pnum.GENERIC_H7A3ZITXQ.build.variant=STM32H7xx/H7A3Z(G-I)TxQ_H7B3ZITxQ
-GenH7.menu.pnum.GENERIC_H7A3ZITXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H7A3.svd
-
 # Generic H7B0VBTx
 GenH7.menu.pnum.GENERIC_H7B0VBTX=Generic H7B0VBTx
 GenH7.menu.pnum.GENERIC_H7B0VBTX.upload.maximum_size=131072
@@ -9611,26 +9140,12 @@ GenH7.menu.pnum.GENERIC_H7B3VITX.build.product_line=STM32H7B3xx
 GenH7.menu.pnum.GENERIC_H7B3VITX.build.variant=STM32H7xx/H7A3V(G-I)(H-T)_H7B0VBT_H7B3VI(H-T)
 GenH7.menu.pnum.GENERIC_H7B3VITX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H7B3.svd
 
-# Generic H7B3ZITxQ
-GenH7.menu.pnum.GENERIC_H7B3ZITXQ=Generic H7B3ZITxQ
-GenH7.menu.pnum.GENERIC_H7B3ZITXQ.upload.maximum_size=2097152
-GenH7.menu.pnum.GENERIC_H7B3ZITXQ.upload.maximum_data_size=1048576
-GenH7.menu.pnum.GENERIC_H7B3ZITXQ.build.board=GENERIC_H7B3ZITXQ
-GenH7.menu.pnum.GENERIC_H7B3ZITXQ.build.product_line=STM32H7B3xxQ
-GenH7.menu.pnum.GENERIC_H7B3ZITXQ.build.variant=STM32H7xx/H7A3Z(G-I)TxQ_H7B3ZITxQ
-GenH7.menu.pnum.GENERIC_H7B3ZITXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H7B3.svd
-
 # Upload menu
 GenH7.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
 GenH7.menu.upload_method.swdMethod.upload.protocol=swd
 GenH7.menu.upload_method.swdMethod.upload.options=
 GenH7.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-GenH7.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-GenH7.menu.upload_method.jlinkMethod.upload.protocol=jlink
-GenH7.menu.upload_method.jlinkMethod.upload.options=
-GenH7.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 GenH7.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenH7.menu.upload_method.serialMethod.upload.protocol=serial
 GenH7.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -9641,18 +9156,6 @@ GenH7.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenH7.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenH7.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-GenH7.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-GenH7.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-GenH7.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-GenH7.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-GenH7.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-GenH7.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-GenH7.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-GenH7.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-GenH7.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # Generic L0
 GenL0.name=Generic STM32L0 series
@@ -9665,7 +9168,7 @@ GenL0.build.series=STM32L0xx
 GenL0.build.flash_offset=0x0
 GenL0.upload.maximum_size=0
 GenL0.upload.maximum_data_size=0
-GenL0.openocd.target=stm32l0
+GenL0.debug.server.openocd.scripts.2=target/stm32l0x.cfg
 GenL0.vid.0=0x0483
 GenL0.pid.0=0x5740
 
@@ -10921,11 +10424,6 @@ GenL0.menu.upload_method.swdMethod.upload.protocol=swd
 GenL0.menu.upload_method.swdMethod.upload.options=
 GenL0.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-GenL0.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-GenL0.menu.upload_method.jlinkMethod.upload.protocol=jlink
-GenL0.menu.upload_method.jlinkMethod.upload.options=
-GenL0.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 GenL0.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenL0.menu.upload_method.serialMethod.upload.protocol=serial
 GenL0.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -10940,14 +10438,6 @@ GenL0.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
 GenL0.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
 GenL0.menu.upload_method.bmpMethod.upload.tool=bmp_upload
 
-GenL0.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-GenL0.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-GenL0.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-GenL0.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-GenL0.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-GenL0.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # Generic L1
 GenL1.name=Generic STM32L1 series
@@ -10960,7 +10450,7 @@ GenL1.build.series=STM32L1xx
 GenL1.build.flash_offset=0x0
 GenL1.upload.maximum_size=0
 GenL1.upload.maximum_data_size=0
-GenL1.openocd.target=stm32l1
+GenL1.debug.server.openocd.scripts.2=target/stm32l1x.cfg
 GenL1.vid.0=0x0483
 GenL1.pid.0=0x5740
 
@@ -10978,7 +10468,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=STM32L100xBA
+GenL1.menu.pnum.GENERIC_L100C6UXA.build.product_line=STM32L100xB
 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
 
@@ -11014,7 +10504,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=STM32L151xBA
+GenL1.menu.pnum.GENERIC_L151C6TXA.build.product_line=STM32L151xB
 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
 
@@ -11023,7 +10513,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=STM32L151xBA
+GenL1.menu.pnum.GENERIC_L151C8TXA.build.product_line=STM32L151xB
 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
 
@@ -11032,7 +10522,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=STM32L151xBA
+GenL1.menu.pnum.GENERIC_L151CBTXA.build.product_line=STM32L151xB
 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
 
@@ -11068,7 +10558,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=STM32L151xBA
+GenL1.menu.pnum.GENERIC_L151C6UXA.build.product_line=STM32L151xB
 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
 
@@ -11077,7 +10567,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=STM32L151xBA
+GenL1.menu.pnum.GENERIC_L151C8UXA.build.product_line=STM32L151xB
 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
 
@@ -11086,7 +10576,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=STM32L151xBA
+GenL1.menu.pnum.GENERIC_L151CBUXA.build.product_line=STM32L151xB
 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
 
@@ -11131,7 +10621,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=STM32L152xBA
+GenL1.menu.pnum.GENERIC_L152C6TXA.build.product_line=STM32L152xB
 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
 
@@ -11140,7 +10630,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=STM32L152xBA
+GenL1.menu.pnum.GENERIC_L152C8TXA.build.product_line=STM32L152xB
 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
 
@@ -11149,7 +10639,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=STM32L152xBA
+GenL1.menu.pnum.GENERIC_L152CBTXA.build.product_line=STM32L152xB
 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
 
@@ -11185,7 +10675,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=STM32L152xBA
+GenL1.menu.pnum.GENERIC_L152C6UXA.build.product_line=STM32L152xB
 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
 
@@ -11194,7 +10684,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=STM32L152xBA
+GenL1.menu.pnum.GENERIC_L152C8UXA.build.product_line=STM32L152xB
 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
 
@@ -11203,7 +10693,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=STM32L152xBA
+GenL1.menu.pnum.GENERIC_L152CBUXA.build.product_line=STM32L152xB
 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
 
@@ -11258,11 +10748,6 @@ GenL1.menu.upload_method.swdMethod.upload.protocol=swd
 GenL1.menu.upload_method.swdMethod.upload.options=
 GenL1.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-GenL1.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-GenL1.menu.upload_method.jlinkMethod.upload.protocol=jlink
-GenL1.menu.upload_method.jlinkMethod.upload.options=
-GenL1.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 GenL1.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenL1.menu.upload_method.serialMethod.upload.protocol=serial
 GenL1.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -11273,18 +10758,6 @@ GenL1.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenL1.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenL1.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-GenL1.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-GenL1.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-GenL1.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-GenL1.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-GenL1.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-GenL1.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-GenL1.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-GenL1.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-GenL1.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # Generic L4
 GenL4.name=Generic STM32L4 series
@@ -11299,7 +10772,7 @@ GenL4.build.series=STM32L4xx
 GenL4.build.flash_offset=0x0
 GenL4.upload.maximum_size=0
 GenL4.upload.maximum_data_size=0
-GenL4.openocd.target=stm32l4x
+GenL4.debug.server.openocd.scripts.2=target/stm32l4x.cfg
 GenL4.vid.0=0x0483
 GenL4.pid.0=0x5740
 
@@ -12075,11 +11548,6 @@ GenL4.menu.upload_method.swdMethod.upload.protocol=swd
 GenL4.menu.upload_method.swdMethod.upload.options=
 GenL4.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-GenL4.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-GenL4.menu.upload_method.jlinkMethod.upload.protocol=jlink
-GenL4.menu.upload_method.jlinkMethod.upload.options=
-GenL4.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 GenL4.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenL4.menu.upload_method.serialMethod.upload.protocol=serial
 GenL4.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -12090,18 +11558,6 @@ GenL4.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenL4.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenL4.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-GenL4.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-GenL4.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-GenL4.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-GenL4.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-GenL4.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-GenL4.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-GenL4.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-GenL4.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-GenL4.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # Generic L5
 GenL5.name=Generic STM32L5 series
@@ -12116,7 +11572,7 @@ GenL5.build.series=STM32L5xx
 GenL5.build.flash_offset=0x0
 GenL5.upload.maximum_size=0
 GenL5.upload.maximum_data_size=0
-GenL5.openocd.target=stm32l5x
+GenL5.debug.server.openocd.scripts.2=target/stm32l5x.cfg
 GenL5.vid.0=0x0483
 GenL5.pid.0=0x5740
 
@@ -12153,11 +11609,6 @@ GenL5.menu.upload_method.swdMethod.upload.protocol=swd
 GenL5.menu.upload_method.swdMethod.upload.options=
 GenL5.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-GenL5.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-GenL5.menu.upload_method.jlinkMethod.upload.protocol=jlink
-GenL5.menu.upload_method.jlinkMethod.upload.options=
-GenL5.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 GenL5.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenL5.menu.upload_method.serialMethod.upload.protocol=serial
 GenL5.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -12168,136 +11619,6 @@ GenL5.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenL5.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenL5.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-GenL5.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-GenL5.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-GenL5.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-GenL5.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-GenL5.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-GenL5.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-GenL5.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-GenL5.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-GenL5.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
-###############################
-# Generic U0
-GenU0.name=Generic STM32U0 series
-
-GenU0.build.core=arduino
-GenU0.build.board=GenG0
-GenU0.build.mcu=cortex-m0plus
-GenU0.build.series=STM32U0xx
-GenU0.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-GenU0.build.flash_offset=0x0
-GenU0.upload.maximum_size=0
-GenU0.upload.maximum_data_size=0
-# Current openocd version does not support U0
-# GenU0.openocd.target=stm32u0x
-GenU0.vid.0=0x0483
-GenU0.pid.0=0x5740
-
-# Generic U073R8Ix
-GenU0.menu.pnum.GENERIC_U073R8IX=Generic U073R8Ix
-GenU0.menu.pnum.GENERIC_U073R8IX.upload.maximum_size=65536
-GenU0.menu.pnum.GENERIC_U073R8IX.upload.maximum_data_size=40960
-GenU0.menu.pnum.GENERIC_U073R8IX.build.board=GENERIC_U073R8IX
-GenU0.menu.pnum.GENERIC_U073R8IX.build.product_line=STM32U073xx
-GenU0.menu.pnum.GENERIC_U073R8IX.build.variant=STM32U0xx/U073R(8-B-C)(I-T)_U083RC(I-T)
-GenU0.menu.pnum.GENERIC_U073R8IX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U0xx/STM32U073.svd
-
-# Generic U073R8Tx
-GenU0.menu.pnum.GENERIC_U073R8TX=Generic U073R8Tx
-GenU0.menu.pnum.GENERIC_U073R8TX.upload.maximum_size=65536
-GenU0.menu.pnum.GENERIC_U073R8TX.upload.maximum_data_size=40960
-GenU0.menu.pnum.GENERIC_U073R8TX.build.board=GENERIC_U073R8TX
-GenU0.menu.pnum.GENERIC_U073R8TX.build.product_line=STM32U073xx
-GenU0.menu.pnum.GENERIC_U073R8TX.build.variant=STM32U0xx/U073R(8-B-C)(I-T)_U083RC(I-T)
-GenU0.menu.pnum.GENERIC_U073R8TX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U0xx/STM32U073.svd
-
-# Generic U073RBIx
-GenU0.menu.pnum.GENERIC_U073RBIX=Generic U073RBIx
-GenU0.menu.pnum.GENERIC_U073RBIX.upload.maximum_size=131072
-GenU0.menu.pnum.GENERIC_U073RBIX.upload.maximum_data_size=40960
-GenU0.menu.pnum.GENERIC_U073RBIX.build.board=GENERIC_U073RBIX
-GenU0.menu.pnum.GENERIC_U073RBIX.build.product_line=STM32U073xx
-GenU0.menu.pnum.GENERIC_U073RBIX.build.variant=STM32U0xx/U073R(8-B-C)(I-T)_U083RC(I-T)
-GenU0.menu.pnum.GENERIC_U073RBIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U0xx/STM32U073.svd
-
-# Generic U073RBTx
-GenU0.menu.pnum.GENERIC_U073RBTX=Generic U073RBTx
-GenU0.menu.pnum.GENERIC_U073RBTX.upload.maximum_size=131072
-GenU0.menu.pnum.GENERIC_U073RBTX.upload.maximum_data_size=40960
-GenU0.menu.pnum.GENERIC_U073RBTX.build.board=GENERIC_U073RBTX
-GenU0.menu.pnum.GENERIC_U073RBTX.build.product_line=STM32U073xx
-GenU0.menu.pnum.GENERIC_U073RBTX.build.variant=STM32U0xx/U073R(8-B-C)(I-T)_U083RC(I-T)
-GenU0.menu.pnum.GENERIC_U073RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U0xx/STM32U073.svd
-
-# Generic U073RCIx
-GenU0.menu.pnum.GENERIC_U073RCIX=Generic U073RCIx
-GenU0.menu.pnum.GENERIC_U073RCIX.upload.maximum_size=262144
-GenU0.menu.pnum.GENERIC_U073RCIX.upload.maximum_data_size=40960
-GenU0.menu.pnum.GENERIC_U073RCIX.build.board=GENERIC_U073RCIX
-GenU0.menu.pnum.GENERIC_U073RCIX.build.product_line=STM32U073xx
-GenU0.menu.pnum.GENERIC_U073RCIX.build.variant=STM32U0xx/U073R(8-B-C)(I-T)_U083RC(I-T)
-GenU0.menu.pnum.GENERIC_U073RCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U0xx/STM32U073.svd
-
-# Generic U073RCTx
-GenU0.menu.pnum.GENERIC_U073RCTX=Generic U073RCTx
-GenU0.menu.pnum.GENERIC_U073RCTX.upload.maximum_size=262144
-GenU0.menu.pnum.GENERIC_U073RCTX.upload.maximum_data_size=40960
-GenU0.menu.pnum.GENERIC_U073RCTX.build.board=GENERIC_U073RCTX
-GenU0.menu.pnum.GENERIC_U073RCTX.build.product_line=STM32U073xx
-GenU0.menu.pnum.GENERIC_U073RCTX.build.variant=STM32U0xx/U073R(8-B-C)(I-T)_U083RC(I-T)
-GenU0.menu.pnum.GENERIC_U073RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U0xx/STM32U073.svd
-
-# Generic U083RCIx
-GenU0.menu.pnum.GENERIC_U083RCIX=Generic U083RCIx
-GenU0.menu.pnum.GENERIC_U083RCIX.upload.maximum_size=262144
-GenU0.menu.pnum.GENERIC_U083RCIX.upload.maximum_data_size=40960
-GenU0.menu.pnum.GENERIC_U083RCIX.build.board=GENERIC_U083RCIX
-GenU0.menu.pnum.GENERIC_U083RCIX.build.product_line=STM32U083xx
-GenU0.menu.pnum.GENERIC_U083RCIX.build.variant=STM32U0xx/U073R(8-B-C)(I-T)_U083RC(I-T)
-GenU0.menu.pnum.GENERIC_U083RCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U0xx/STM32U083.svd
-
-# Generic U083RCTx
-GenU0.menu.pnum.GENERIC_U083RCTX=Generic U083RCTx
-GenU0.menu.pnum.GENERIC_U083RCTX.upload.maximum_size=262144
-GenU0.menu.pnum.GENERIC_U083RCTX.upload.maximum_data_size=40960
-GenU0.menu.pnum.GENERIC_U083RCTX.build.board=GENERIC_U083RCTX
-GenU0.menu.pnum.GENERIC_U083RCTX.build.product_line=STM32U083xx
-GenU0.menu.pnum.GENERIC_U083RCTX.build.variant=STM32U0xx/U073R(8-B-C)(I-T)_U083RC(I-T)
-GenU0.menu.pnum.GENERIC_U083RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U0xx/STM32U083.svd
-
-# Upload menu
-GenU0.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
-GenU0.menu.upload_method.swdMethod.upload.protocol=swd
-GenU0.menu.upload_method.swdMethod.upload.options=
-GenU0.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
-
-GenU0.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-GenU0.menu.upload_method.jlinkMethod.upload.protocol=jlink
-GenU0.menu.upload_method.jlinkMethod.upload.options=
-GenU0.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
-GenU0.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
-GenU0.menu.upload_method.serialMethod.upload.protocol=serial
-GenU0.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
-GenU0.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
-
-GenU0.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
-GenU0.menu.upload_method.dfuMethod.upload.protocol=dfu
-GenU0.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
-GenU0.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
-
-#GenU0.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-#GenU0.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-#GenU0.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-#GenU0.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-#GenU0.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-#GenU0.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # Generic U5
 GenU5.name=Generic STM32U5 series
@@ -12312,7 +11633,7 @@ GenU5.build.series=STM32U5xx
 GenU5.build.flash_offset=0x0
 GenU5.upload.maximum_size=0
 GenU5.upload.maximum_data_size=0
-GenU5.openocd.target=stm32u5x
+GenU5.debug.server.openocd.scripts.2=target/stm32u5x.cfg
 GenU5.vid.0=0x0483
 GenU5.pid.0=0x5740
 
@@ -12412,11 +11733,6 @@ GenU5.menu.upload_method.swdMethod.upload.protocol=swd
 GenU5.menu.upload_method.swdMethod.upload.options=
 GenU5.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-GenU5.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-GenU5.menu.upload_method.jlinkMethod.upload.protocol=jlink
-GenU5.menu.upload_method.jlinkMethod.upload.options=
-GenU5.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 GenU5.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenU5.menu.upload_method.serialMethod.upload.protocol=serial
 GenU5.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -12427,18 +11743,6 @@ GenU5.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenU5.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenU5.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-GenU5.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-GenU5.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-GenU5.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-GenU5.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-GenU5.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-GenU5.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-GenU5.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-GenU5.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-GenU5.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # Generic WB
 GenWB.name=Generic STM32WB series
@@ -12453,7 +11757,7 @@ GenWB.build.series=STM32WBxx
 GenWB.build.flash_offset=0x0
 GenWB.upload.maximum_size=0
 GenWB.upload.maximum_data_size=0
-GenWB.openocd.target=stm32wbx
+GenWB.debug.server.openocd.scripts.2=target/stm32wbx.cfg
 GenWB.vid.0=0x0483
 GenWB.pid.0=0x5740
 
@@ -12535,11 +11839,6 @@ GenWB.menu.upload_method.swdMethod.upload.protocol=swd
 GenWB.menu.upload_method.swdMethod.upload.options=
 GenWB.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-GenWB.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-GenWB.menu.upload_method.jlinkMethod.upload.protocol=jlink
-GenWB.menu.upload_method.jlinkMethod.upload.options=
-GenWB.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 GenWB.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenWB.menu.upload_method.serialMethod.upload.protocol=serial
 GenWB.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -12550,18 +11849,6 @@ GenWB.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenWB.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenWB.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-GenWB.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-GenWB.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-GenWB.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-GenWB.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-GenWB.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-GenWB.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-GenWB.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-GenWB.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-GenWB.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # Generic WBA
 GenWBA.name=Generic STM32WBA series
@@ -12576,7 +11863,7 @@ GenWBA.build.series=STM32WBAxx
 GenWBA.build.flash_offset=0x0
 GenWBA.upload.maximum_size=0
 GenWBA.upload.maximum_data_size=0
-GenWBA.openocd.target=stm32wbax
+GenWBA.debug.server.openocd.scripts.2=target/stm32wbax.cfg
 
 # Generic WBA55CEUx
 GenWBA.menu.pnum.GENERIC_WBA55CEUX=Generic WBA55CEUx
@@ -12602,24 +11889,11 @@ GenWBA.menu.upload_method.swdMethod.upload.protocol=swd
 GenWBA.menu.upload_method.swdMethod.upload.options=
 GenWBA.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-GenWBA.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-GenWBA.menu.upload_method.jlinkMethod.upload.protocol=jlink
-GenWBA.menu.upload_method.jlinkMethod.upload.options=
-GenWBA.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 GenWBA.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenWBA.menu.upload_method.serialMethod.upload.protocol=serial
 GenWBA.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 GenWBA.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
-GenWBA.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-GenWBA.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-GenWBA.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-GenWBA.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-GenWBA.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-GenWBA.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # Generic WL
 GenWL.name=Generic STM32WL series
@@ -12634,7 +11908,7 @@ GenWL.build.series=STM32WLxx
 GenWL.build.flash_offset=0x0
 GenWL.upload.maximum_size=0
 GenWL.upload.maximum_data_size=0
-GenWL.openocd.target=stm32wlx
+GenWL.debug.server.openocd.scripts.2=target/stm32wlx.cfg
 
 # Generic WL54CCUx
 GenWL.menu.pnum.GENERIC_WL54CCUX=Generic WL54CCUx
@@ -12786,11 +12060,6 @@ GenWL.menu.upload_method.swdMethod.upload.protocol=swd
 GenWL.menu.upload_method.swdMethod.upload.options=
 GenWL.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-GenWL.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-GenWL.menu.upload_method.jlinkMethod.upload.protocol=jlink
-GenWL.menu.upload_method.jlinkMethod.upload.options=
-GenWL.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 GenWL.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenWL.menu.upload_method.serialMethod.upload.protocol=serial
 GenWL.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -12801,18 +12070,6 @@ GenWL.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenWL.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-GenWL.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-GenWL.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-GenWL.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-GenWL.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-GenWL.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-GenWL.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-GenWL.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-GenWL.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-GenWL.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # 3D printer boards
 
@@ -12840,7 +12097,7 @@ GenWL.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
 3dprinter.menu.pnum.ARMED_V1.build.product_line=STM32F407xx
 3dprinter.menu.pnum.ARMED_V1.build.variant=STM32F4xx/F407V(E-G)T_F417V(E-G)T
 3dprinter.menu.pnum.ARMED_V1.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-3dprinter.menu.pnum.ARMED_V1.openocd.target=stm32f4x
+3dprinter.menu.pnum.ARMED_V1.debug.server.openocd.scripts.2=target/stm32f4x.cfg
 3dprinter.menu.pnum.ARMED_V1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F407.svd
 
 # Big Tree Tech EBB42_V1_1 board
@@ -12853,7 +12110,7 @@ GenWL.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
 3dprinter.menu.pnum.EBB42_V1_1.build.product_line=STM32G0B1xx
 3dprinter.menu.pnum.EBB42_V1_1.build.variant=STM32G0xx/G0B1C(B-C-E)(T-U)_G0C1C(C-E)(T-U)
 3dprinter.menu.pnum.EBB42_V1_1.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-3dprinter.menu.pnum.EBB42_V1_1.openocd.target=stm32g0x
+3dprinter.menu.pnum.EBB42_V1_1.debug.server.openocd.scripts.2=target/stm32g0x.cfg
 3dprinter.menu.pnum.EBB42_V1_1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G0xx/STM32G0B1.svd
 
 # REMRAM_V1 board
@@ -12868,7 +12125,7 @@ GenWL.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
 3dprinter.menu.pnum.REMRAM_V1.build.product_line=STM32F765xx
 3dprinter.menu.pnum.REMRAM_V1.build.variant=STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)
 3dprinter.menu.pnum.REMRAM_V1.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-3dprinter.menu.pnum.REMRAM_V1.openocd.target=stm32f7x
+3dprinter.menu.pnum.REMRAM_V1.debug.server.openocd.scripts.2=target/stm32f7x.cfg
 3dprinter.menu.pnum.REMRAM_V1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F7xx/STM32F765.svd
 
 # RUMBA32 board
@@ -12883,7 +12140,7 @@ GenWL.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
 3dprinter.menu.pnum.RUMBA32.build.product_line=STM32F446xx
 3dprinter.menu.pnum.RUMBA32.build.variant=STM32F4xx/F446V(C-E)T
 3dprinter.menu.pnum.RUMBA32.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-3dprinter.menu.pnum.RUMBA32.openocd.target=stm32f4x
+3dprinter.menu.pnum.RUMBA32.debug.server.openocd.scripts.2=target/stm32f4x.cfg
 3dprinter.menu.pnum.RUMBA32.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F446.svd
 
 # STEVAL-3DP001V1 board
@@ -12898,7 +12155,7 @@ GenWL.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
 3dprinter.menu.pnum.ST3DP001_EVAL.build.product_line=STM32F401xE
 3dprinter.menu.pnum.ST3DP001_EVAL.build.variant=STM32F4xx/F401V(B-C-D-E)T
 3dprinter.menu.pnum.ST3DP001_EVAL.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-3dprinter.menu.pnum.ST3DP001_EVAL.openocd.target=stm32f4x
+3dprinter.menu.pnum.ST3DP001_EVAL.debug.server.openocd.scripts.2=target/stm32f4x.cfg
 3dprinter.menu.pnum.ST3DP001_EVAL.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F401.svd
 
 # PRNTR_V1 board
@@ -12913,7 +12170,7 @@ GenWL.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
 3dprinter.menu.pnum.PRNTR_V1.build.product_line=STM32F407xx
 3dprinter.menu.pnum.PRNTR_V1.build.variant=STM32F4xx/F407V(E-G)T_F417V(E-G)T
 3dprinter.menu.pnum.PRNTR_V1.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-3dprinter.menu.pnum.PRNTR_V1.openocd.target=stm32f4x
+3dprinter.menu.pnum.PRNTR_V1.debug.server.openocd.scripts.2=target/stm32f4x.cfg
 3dprinter.menu.pnum.PRNTR_V1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F407.svd
 
 # PRNTR_V2 board
@@ -12930,7 +12187,7 @@ GenWL.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
 3dprinter.menu.pnum.PRNTR_V2.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 3dprinter.menu.pnum.PRNTR_V2.build.flash_offset=0x8000
 3dprinter.menu.pnum.PRNTR_V2.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
-3dprinter.menu.pnum.PRNTR_V2.openocd.target=stm32f4x
+3dprinter.menu.pnum.PRNTR_V2.debug.server.openocd.scripts.2=target/stm32f4x.cfg
 3dprinter.menu.pnum.PRNTR_V2.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F407.svd
 
 # EEXTR_F030_V1 board
@@ -12943,7 +12200,7 @@ GenWL.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
 3dprinter.menu.pnum.EEXTR_F030_V1.build.product_line=STM32F030x8
 3dprinter.menu.pnum.EEXTR_F030_V1.build.variant=STM32F0xx/F030C8T
 3dprinter.menu.pnum.EEXTR_F030_V1.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-3dprinter.menu.pnum.EEXTR_F030_V1.openocd.target=stm32f0x
+3dprinter.menu.pnum.EEXTR_F030_V1.debug.server.openocd.scripts.2=target/stm32f0x.cfg
 3dprinter.menu.pnum.EEXTR_F030_V1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x0.svd
 
 # MALYANM200_F103CB board
@@ -12959,7 +12216,7 @@ GenWL.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
 3dprinter.menu.pnum.MALYANM200_F103CB.build.startup_file=-DCUSTOM_STARTUP_FILE
 3dprinter.menu.pnum.MALYANM200_F103CB.build.flash_offset=0x2000
 3dprinter.menu.pnum.MALYANM200_F103CB.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
-3dprinter.menu.pnum.MALYANM200_F103CB.openocd.target=stm32f1x
+3dprinter.menu.pnum.MALYANM200_F103CB.debug.server.openocd.scripts.2=target/stm32f1x.cfg
 3dprinter.menu.pnum.MALYANM200_F103CB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F103.svd
 
 # MALYANM200_F070CB board
@@ -12976,7 +12233,7 @@ GenWL.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
 3dprinter.menu.pnum.MALYANM200_F070CB.build.ldscript=MALYANMx00_F070CB.ld
 3dprinter.menu.pnum.MALYANM200_F070CB.build.flash_offset=0x2000
 3dprinter.menu.pnum.MALYANM200_F070CB.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
-3dprinter.menu.pnum.MALYANM200_F070CB.openocd.target=stm32f0x
+3dprinter.menu.pnum.MALYANM200_F070CB.debug.server.openocd.scripts.2=target/stm32f0x.cfg
 3dprinter.menu.pnum.MALYANM200_F070CB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x0.svd
 
 # MALYANM300_F070CB board
@@ -12993,7 +12250,7 @@ GenWL.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
 3dprinter.menu.pnum.MALYANM200_F070CB.build.ldscript=MALYANMx00_F070CB.ld
 3dprinter.menu.pnum.MALYANM300_F070CB.build.flash_offset=0x2000
 3dprinter.menu.pnum.MALYANM300_F070CB.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
-3dprinter.menu.pnum.MALYANM300_F070CB.openocd.target=stm32f0x
+3dprinter.menu.pnum.MALYANM300_F070CB.debug.server.openocd.scripts.2=target/stm32f0x.cfg
 3dprinter.menu.pnum.MALYANM300_F070CB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x0.svd
 
 # VAkE v1.0
@@ -13008,7 +12265,7 @@ GenWL.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
 3dprinter.menu.pnum.VAKE_V1.build.product_line=STM32F446xx
 3dprinter.menu.pnum.VAKE_V1.build.variant=STM32F4xx/F446V(C-E)T
 3dprinter.menu.pnum.VAKE_V1.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-3dprinter.menu.pnum.VAKE_V1.openocd.target=stm32f4x
+3dprinter.menu.pnum.VAKE_V1.debug.server.openocd.scripts.2=target/stm32f4x.cfg
 3dprinter.menu.pnum.VAKE_V1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F446.svd
 
 # FYSETC_S6 board
@@ -13025,7 +12282,7 @@ GenWL.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
 3dprinter.menu.pnum.FYSETC_S6.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 3dprinter.menu.pnum.FYSETC_S6.build.flash_offset=0x10000
 3dprinter.menu.pnum.FYSETC_S6.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
-3dprinter.menu.pnum.FYSETC_S6.openocd.target=stm32f4x
+3dprinter.menu.pnum.FYSETC_S6.debug.server.openocd.scripts.2=target/stm32f4x.cfg
 3dprinter.menu.pnum.FYSETC_S6.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F446.svd
 
 # Upload menu
@@ -13034,11 +12291,6 @@ GenWL.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
 3dprinter.menu.upload_method.swdMethod.upload.options=
 3dprinter.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-3dprinter.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-3dprinter.menu.upload_method.jlinkMethod.upload.protocol=jlink
-3dprinter.menu.upload_method.jlinkMethod.upload.options=
-3dprinter.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 3dprinter.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 3dprinter.menu.upload_method.serialMethod.upload.protocol=serial
 3dprinter.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -13049,18 +12301,6 @@ GenWL.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
 3dprinter.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 3dprinter.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-3dprinter.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-3dprinter.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-3dprinter.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-3dprinter.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-3dprinter.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-3dprinter.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-3dprinter.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-3dprinter.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-3dprinter.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # Blues boards
 
@@ -13073,6 +12313,7 @@ Blues.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSer
 Blues.build.flash_offset=0x0
 Blues.upload.maximum_size=0
 Blues.upload.maximum_data_size=0
+Blues.vid.0=0x30A4
 
 # Swan R5 board
 Blues.menu.pnum.SWAN_R5=Swan R5
@@ -13086,9 +12327,8 @@ Blues.menu.pnum.SWAN_R5.build.series=STM32L4xx
 Blues.menu.pnum.SWAN_R5.build.product_line=STM32L4R5xx
 Blues.menu.pnum.SWAN_R5.build.variant=STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY
 Blues.menu.pnum.SWAN_R5.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Blues.menu.pnum.SWAN_R5.vid.0=0x30A4
 Blues.menu.pnum.SWAN_R5.pid.0=0x0002
-Blues.menu.pnum.SWAN_R5.openocd.target=stm32l4x
+Blues.menu.pnum.SWAN_R5.debug.server.openocd.scripts.2=target/stm32l4x.cfg
 Blues.menu.pnum.SWAN_R5.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4R5.svd
 
 # Cygnet board
@@ -13103,9 +12343,8 @@ Blues.menu.pnum.CYGNET.build.series=STM32L4xx
 Blues.menu.pnum.CYGNET.build.product_line=STM32L433xx
 Blues.menu.pnum.CYGNET.build.variant=STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)
 Blues.menu.pnum.CYGNET.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Blues.menu.pnum.CYGNET.vid.0=0x30A4
-Blues.menu.pnum.CYGNET.pid.0=0x0003
-Blues.menu.pnum.CYGNET.openocd.target=stm32l4x
+Blues.menu.pnum.CYGNET.build.pid=0x0003
+Blues.menu.pnum.CYGNET.debug.server.openocd.scripts.2=target/stm32l4x.cfg
 Blues.menu.pnum.CYGNET.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
 
 # Upload menu
@@ -13114,11 +12353,6 @@ Blues.menu.upload_method.swdMethod.upload.protocol=swd
 Blues.menu.upload_method.swdMethod.upload.options=
 Blues.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-Blues.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-Blues.menu.upload_method.jlinkMethod.upload.protocol=jlink
-Blues.menu.upload_method.jlinkMethod.upload.options=
-Blues.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 Blues.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 Blues.menu.upload_method.serialMethod.upload.protocol=serial
 Blues.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -13129,18 +12363,6 @@ Blues.menu.upload_method.dfuMethod.upload.protocol=dfu
 Blues.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 Blues.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-Blues.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-Blues.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-Blues.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-Blues.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-Blues.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-Blues.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-Blues.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-Blues.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-Blues.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # Elecgator boards
 
@@ -13168,7 +12390,7 @@ Elecgator.menu.pnum.ETHERCAT_DUINO.build.series=STM32F7xx
 Elecgator.menu.pnum.ETHERCAT_DUINO.build.product_line=STM32F746xx
 Elecgator.menu.pnum.ETHERCAT_DUINO.build.variant=STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)
 Elecgator.menu.pnum.ETHERCAT_DUINO.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Elecgator.menu.pnum.ETHERCAT_DUINO.openocd.target=stm32f7x
+Elecgator.menu.pnum.ETHERCAT_DUINO.debug.server.openocd.scripts.2=target/stm32f7x.cfg
 Elecgator.menu.pnum.ETHERCAT_DUINO.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F7xx/STM32F746.svd
 
 # Upload menu
@@ -13177,28 +12399,11 @@ Elecgator.menu.upload_method.swdMethod.upload.protocol=swd
 Elecgator.menu.upload_method.swdMethod.upload.options=
 Elecgator.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-Elecgator.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-Elecgator.menu.upload_method.jlinkMethod.upload.protocol=jlink
-Elecgator.menu.upload_method.jlinkMethod.upload.options=
-Elecgator.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 Elecgator.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
 Elecgator.menu.upload_method.dfuMethod.upload.protocol=dfu
 Elecgator.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 Elecgator.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-Elecgator.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-Elecgator.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-Elecgator.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-Elecgator.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-Elecgator.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-Elecgator.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-Elecgator.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-Elecgator.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-Elecgator.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # Electronic Speed Controller boards
 
@@ -13224,7 +12429,7 @@ ESC_board.menu.pnum.WRAITH32_V1.build.series=STM32F0xx
 ESC_board.menu.pnum.WRAITH32_V1.build.product_line=STM32F051x8
 ESC_board.menu.pnum.WRAITH32_V1.build.variant=STM32F0xx/F051K(6-8)U
 ESC_board.menu.pnum.WRAITH32_V1.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-ESC_board.menu.pnum.WRAITH32_V1.openocd.target=stm32f0x
+ESC_board.menu.pnum.WRAITH32_V1.debug.server.openocd.scripts.2=target/stm32f0x.cfg
 ESC_board.menu.pnum.WRAITH32_V1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x1.svd
 
 # STORM32_V1_RC board
@@ -13237,7 +12442,7 @@ ESC_board.menu.pnum.STORM32_V1_31_RC.build.series=STM32F1xx
 ESC_board.menu.pnum.STORM32_V1_31_RC.build.product_line=STM32F103xE
 ESC_board.menu.pnum.STORM32_V1_31_RC.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 ESC_board.menu.pnum.STORM32_V1_31_RC.build.variant=STM32F1xx/F103R(C-D-E)T
-ESC_board.menu.pnum.STORM32_V1_31_RC.openocd.target=stm32f1x
+ESC_board.menu.pnum.STORM32_V1_31_RC.debug.server.openocd.scripts.2=target/stm32f1x.cfg
 ESC_board.menu.pnum.STORM32_V1_31_RC.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F103.svd
 
 # Upload menu
@@ -13246,11 +12451,6 @@ ESC_board.menu.upload_method.swdMethod.upload.protocol=swd
 ESC_board.menu.upload_method.swdMethod.upload.options=
 ESC_board.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-ESC_board.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-ESC_board.menu.upload_method.jlinkMethod.upload.protocol=jlink
-ESC_board.menu.upload_method.jlinkMethod.upload.options=
-ESC_board.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 ESC_board.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 ESC_board.menu.upload_method.serialMethod.upload.protocol=serial
 ESC_board.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -13261,18 +12461,6 @@ ESC_board.menu.upload_method.dfuMethod.upload.protocol=dfu
 ESC_board.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 ESC_board.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-ESC_board.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-ESC_board.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-ESC_board.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-ESC_board.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-ESC_board.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-ESC_board.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-ESC_board.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-ESC_board.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-ESC_board.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # Garatronic-McHobby STM32 boards
 
@@ -13298,7 +12486,7 @@ Garatronic.menu.pnum.PYBSTICK26_DUINO.build.series=STM32F0xx
 Garatronic.menu.pnum.PYBSTICK26_DUINO.build.product_line=STM32F072xB
 Garatronic.menu.pnum.PYBSTICK26_DUINO.build.variant=STM32F0xx/F072R8T_F072RB(H-I-T)
 Garatronic.menu.pnum.PYBSTICK26_DUINO.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Garatronic.menu.pnum.PYBSTICK26_DUINO.openocd.target=stm32f0x
+Garatronic.menu.pnum.PYBSTICK26_DUINO.debug.server.openocd.scripts.2=target/stm32f0x.cfg
 Garatronic.menu.pnum.PYBSTICK26_DUINO.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
 
 # PYBSTICK26(LITE) board with F401CE
@@ -13313,7 +12501,7 @@ Garatronic.menu.pnum.PYBSTICK26_LITE.build.variant=STM32F4xx/F401CC(F-U-Y)_F401C
 Garatronic.menu.pnum.PYBSTICK26_LITE.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 Garatronic.menu.pnum.PYBSTICK26_LITE.build.fpu=-mfpu=fpv4-sp-d16
 Garatronic.menu.pnum.PYBSTICK26_LITE.build.float-abi=-mfloat-abi=hard
-Garatronic.menu.pnum.PYBSTICK26_LITE.openocd.target=stm32f4x
+Garatronic.menu.pnum.PYBSTICK26_LITE.debug.server.openocd.scripts.2=target/stm32f4x.cfg
 Garatronic.menu.pnum.PYBSTICK26_LITE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F401.svd
 
 # PYBSTICK26(STD/Programmez!) board with F411RE
@@ -13328,7 +12516,7 @@ Garatronic.menu.pnum.PYBSTICK26_STD.build.variant=STM32F4xx/F411R(C-E)T
 Garatronic.menu.pnum.PYBSTICK26_STD.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 Garatronic.menu.pnum.PYBSTICK26_STD.build.fpu=-mfpu=fpv4-sp-d16
 Garatronic.menu.pnum.PYBSTICK26_STD.build.float-abi=-mfloat-abi=hard
-Garatronic.menu.pnum.PYBSTICK26_STD.openocd.target=stm32f4x
+Garatronic.menu.pnum.PYBSTICK26_STD.debug.server.openocd.scripts.2=target/stm32f4x.cfg
 Garatronic.menu.pnum.PYBSTICK26_STD.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F411.svd
 
 # PYBSTICK26(PRO) board with F412RE
@@ -13343,7 +12531,7 @@ Garatronic.menu.pnum.PYBSTICK26_PRO.build.variant=STM32F4xx/F412R(E-G)(T-Y)x(P)
 Garatronic.menu.pnum.PYBSTICK26_PRO.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 Garatronic.menu.pnum.PYBSTICK26_PRO.build.fpu=-mfpu=fpv4-sp-d16
 Garatronic.menu.pnum.PYBSTICK26_PRO.build.float-abi=-mfloat-abi=hard
-Garatronic.menu.pnum.PYBSTICK26_PRO.openocd.target=stm32f4x
+Garatronic.menu.pnum.PYBSTICK26_PRO.debug.server.openocd.scripts.2=target/stm32f4x.cfg
 Garatronic.menu.pnum.PYBSTICK26_PRO.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F412.svd
 
 # PYBSTICK26 boards upload method
@@ -13379,7 +12567,7 @@ GenFlight.menu.pnum.AFROFLIGHT_F103CB.build.variant=STM32F1xx/F103C8T_F103CB(T-U
 GenFlight.menu.pnum.AFROFLIGHT_F103CB.build.variant_h=variant_AFROFLIGHT_F103CB_XX.h
 GenFlight.menu.pnum.AFROFLIGHT_F103CB.upload.vid.0=0x1eaf
 GenFlight.menu.pnum.AFROFLIGHT_F103CB.upload.pid.0=0x0003
-GenFlight.menu.pnum.AFROFLIGHT_F103CB.openocd.target=stm32f1x
+GenFlight.menu.pnum.AFROFLIGHT_F103CB.debug.server.openocd.scripts.2=target/stm32f1x.cfg
 GenFlight.menu.pnum.AFROFLIGHT_F103CB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F103.svd
 
 GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M=Afro Flight Rev5 (12MHz)
@@ -13393,7 +12581,7 @@ GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M.build.variant=STM32F1xx/F103C8T_F103CB
 GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M.build.variant_h=variant_AFROFLIGHT_F103CB_XX.h
 GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M.upload.vid.0=0x1eaf
 GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M.upload.pid.0=0x0003
-GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M.openocd.target=stm32f1x
+GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M.debug.server.openocd.scripts.2=target/stm32f1x.cfg
 GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F103.svd
 
 # Sparky_V1 board
@@ -13408,7 +12596,7 @@ GenFlight.menu.pnum.Sparky_V1.build.fpu=-mfpu=fpv4-sp-d16
 GenFlight.menu.pnum.Sparky_V1.build.float-abi=-mfloat-abi=hard
 GenFlight.menu.pnum.Sparky_V1.build.variant=STM32F3xx/F303C(B-C)T
 GenFlight.menu.pnum.Sparky_V1.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-GenFlight.menu.pnum.Sparky_V1.openocd.target=stm32f3x
+GenFlight.menu.pnum.Sparky_V1.debug.server.openocd.scripts.2=target/stm32f3x.cfg
 GenFlight.menu.pnum.Sparky_V1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F3xx/STM32F303.svd
 
 # Upload menu
@@ -13417,11 +12605,6 @@ GenFlight.menu.upload_method.swdMethod.upload.protocol=swd
 GenFlight.menu.upload_method.swdMethod.upload.options=
 GenFlight.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-GenFlight.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-GenFlight.menu.upload_method.jlinkMethod.upload.protocol=jlink
-GenFlight.menu.upload_method.jlinkMethod.upload.options=
-GenFlight.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 GenFlight.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenFlight.menu.upload_method.serialMethod.upload.protocol=serial
 GenFlight.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -13456,14 +12639,6 @@ GenFlight.menu.upload_method.dfuoMethod.upload.altID=1
 GenFlight.menu.upload_method.dfuoMethod.build.flash_offset=0x5000
 GenFlight.menu.upload_method.dfuoMethod.build.bootloader_flags=-DBL_LEGACY_LEAF
 
-GenFlight.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-GenFlight.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-GenFlight.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-GenFlight.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-GenFlight.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-GenFlight.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # IoT continuum Boards
 
@@ -13489,7 +12664,7 @@ IotContinuum.menu.pnum.DEVKIT_IOT_CONTINUUM.build.series=STM32U5xx
 IotContinuum.menu.pnum.DEVKIT_IOT_CONTINUUM.build.product_line=STM32U585xx
 IotContinuum.menu.pnum.DEVKIT_IOT_CONTINUUM.build.variant=STM32U5xx/U575C(G-I)(T-U)_U585CI(T-U)
 IotContinuum.menu.pnum.DEVKIT_IOT_CONTINUUM.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-IotContinuum.menu.pnum.DEVKIT_IOT_CONTINUUM.openocd.target=stm32u5x
+IotContinuum.menu.pnum.DEVKIT_IOT_CONTINUUM.debug.server.openocd.scripts.2=target/stm32u5x.cfg
 IotContinuum.menu.pnum.DEVKIT_IOT_CONTINUUM.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U5xx/STM32U585.svd
 
 # Upload menu
@@ -13498,11 +12673,6 @@ IotContinuum.menu.upload_method.swdMethod.upload.protocol=swd
 IotContinuum.menu.upload_method.swdMethod.upload.options=
 IotContinuum.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-IotContinuum.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-IotContinuum.menu.upload_method.jlinkMethod.upload.protocol=jlink
-IotContinuum.menu.upload_method.jlinkMethod.upload.options=
-IotContinuum.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 IotContinuum.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 IotContinuum.menu.upload_method.serialMethod.upload.protocol=serial
 IotContinuum.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -13513,18 +12683,6 @@ IotContinuum.menu.upload_method.dfuMethod.upload.protocol=dfu
 IotContinuum.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 IotContinuum.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-IotContinuum.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-IotContinuum.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-IotContinuum.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-IotContinuum.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-IotContinuum.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-IotContinuum.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-IotContinuum.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-IotContinuum.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-IotContinuum.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # LoRa boards
 
@@ -13550,7 +12708,7 @@ LoRa.menu.pnum.ACSIP_S76S.build.product_line=STM32L073xx
 LoRa.menu.pnum.ACSIP_S76S.build.variant=STM32L0xx/L072R(B-Z)T_L073R(B-Z)T_L083R(B-Z)T
 LoRa.menu.pnum.ACSIP_S76S.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 LoRa.menu.pnum.ACSIP_S76S.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-LoRa.menu.pnum.ACSIP_S76S.openocd.target=stm32l0
+LoRa.menu.pnum.ACSIP_S76S.debug.server.openocd.scripts.2=target/stm32l0x.cfg
 LoRa.menu.pnum.ACSIP_S76S.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L0xx/STM32L0x3.svd
 
 # Generic node SE by The Things Industries
@@ -13564,7 +12722,7 @@ LoRa.menu.pnum.GENERIC_NODE_SE_TTI.build.product_line=STM32WL55xx
 LoRa.menu.pnum.GENERIC_NODE_SE_TTI.build.variant=STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U
 LoRa.menu.pnum.GENERIC_NODE_SE_TTI.build.variant_h=variant_GENERIC_NODE_SE_TTI.h
 LoRa.menu.pnum.GENERIC_NODE_SE_TTI.build.st_extra_flags=-D{build.product_line} -DUSE_CM4_STARTUP_FILE {build.xSerial}
-LoRa.menu.pnum.GENERIC_NODE_SE_TTI.openocd.target=stm32wlx
+LoRa.menu.pnum.GENERIC_NODE_SE_TTI.debug.server.openocd.scripts.2=target/stm32wlx.cfg
 LoRa.menu.pnum.GENERIC_NODE_SE_TTI.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WLxx/STM32WL5x_CM4.svd
 
 # LORA_E5_MINI board
@@ -13578,7 +12736,7 @@ LoRa.menu.pnum.LORA_E5_MINI.build.product_line=STM32WLE5xx
 LoRa.menu.pnum.LORA_E5_MINI.build.variant=STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I
 LoRa.menu.pnum.LORA_E5_MINI.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 LoRa.menu.pnum.LORA_E5_MINI.build.variant_h=variant_LORA_E5_MINI.h
-LoRa.menu.pnum.LORA_E5_MINI.openocd.target=stm32wlx
+LoRa.menu.pnum.LORA_E5_MINI.debug.server.openocd.scripts.2=target/stm32wlx.cfg
 LoRa.menu.pnum.LORA_E5_MINI.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WLxx/STM32WLE5_CM4.svd
 
 # RAK3172 module
@@ -13591,7 +12749,7 @@ LoRa.menu.pnum.RAK3172_MODULE.build.series=STM32WLxx
 LoRa.menu.pnum.RAK3172_MODULE.build.product_line=STM32WLE5xx
 LoRa.menu.pnum.RAK3172_MODULE.build.variant=STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U
 LoRa.menu.pnum.RAK3172_MODULE.build.variant_h=variant_RAK3172_MODULE.h
-LoRa.menu.pnum.RAK3172_MODULE.openocd.target=stm32wlx
+LoRa.menu.pnum.RAK3172_MODULE.debug.server.openocd.scripts.2=target/stm32wlx.cfg
 LoRa.menu.pnum.RAK3172_MODULE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WLxx/STM32WLE5_CM4.svd
 
 # RAK3172T module
@@ -13604,7 +12762,7 @@ LoRa.menu.pnum.RAK3172T_MODULE.build.series=STM32WLxx
 LoRa.menu.pnum.RAK3172T_MODULE.build.product_line=STM32WLE5xx
 LoRa.menu.pnum.RAK3172T_MODULE.build.variant=STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U
 LoRa.menu.pnum.RAK3172T_MODULE.build.variant_h=variant_RAK3172_MODULE.h
-LoRa.menu.pnum.RAK3172T_MODULE.openocd.target=stm32wlx
+LoRa.menu.pnum.RAK3172T_MODULE.debug.server.openocd.scripts.2=target/stm32wlx.cfg
 LoRa.menu.pnum.RAK3172T_MODULE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WLxx/STM32WLE5_CM4.svd
 
 # RAK811_TRACKER board
@@ -13617,7 +12775,7 @@ LoRa.menu.pnum.RAK811_TRACKER.build.series=STM32L1xx
 LoRa.menu.pnum.RAK811_TRACKER.build.product_line=STM32L151xB
 LoRa.menu.pnum.RAK811_TRACKER.build.variant=STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)
 LoRa.menu.pnum.RAK811_TRACKER.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-LoRa.menu.pnum.RAK811_TRACKER.openocd.target=stm32l1
+LoRa.menu.pnum.RAK811_TRACKER.debug.server.openocd.scripts.2=target/stm32l1x.cfg
 LoRa.menu.pnum.RAK811_TRACKER.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L1xx/STM32L151.svd
 
 LoRa.menu.pnum.RAK811_TRACKERA=RAK811 LoRa Tracker (32kb RAM)
@@ -13630,7 +12788,7 @@ LoRa.menu.pnum.RAK811_TRACKERA.build.product_line=STM32L151xBA
 LoRa.menu.pnum.RAK811_TRACKERA.build.variant=STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)
 LoRa.menu.pnum.RAK811_TRACKERA.build.variant_h=variant_RAK811_TRACKER.h
 LoRa.menu.pnum.RAK811_TRACKERA.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-LoRa.menu.pnum.RAK811_TRACKERA.openocd.target=stm32l1
+LoRa.menu.pnum.RAK811_TRACKERA.debug.server.openocd.scripts.2=target/stm32l1x.cfg
 
 # RHF76_052 board
 LoRa.menu.pnum.RHF76_052=RHF76 052
@@ -13643,7 +12801,7 @@ LoRa.menu.pnum.RHF76_052.build.product_line=STM32L051xx
 LoRa.menu.pnum.RHF76_052.build.variant=STM32L0xx/L051C(6-8)(T-U)
 LoRa.menu.pnum.RHF76_052.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 LoRa.menu.pnum.RHF76_052.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-LoRa.menu.pnum.RHF76_052.openocd.target=stm32l0
+LoRa.menu.pnum.RHF76_052.debug.server.openocd.scripts.2=target/stm32l0x.cfg
 LoRa.menu.pnum.RHF76_052.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L0xx/STM32L0x1.svd
 
 # ELEKTOR_F072C8
@@ -13658,7 +12816,7 @@ LoRa.menu.pnum.ELEKTOR_F072C8.build.variant=STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)
 LoRa.menu.pnum.ELEKTOR_F072C8.build.variant_h=variant_ELEKTOR_F072Cx.h
 LoRa.menu.pnum.ELEKTOR_F072C8.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 LoRa.menu.pnum.ELEKTOR_F072C8.build.st_extra_flags=-D{build.product_line} {build.xSerial}
-LoRa.menu.pnum.ELEKTOR_F072C8.openocd.target=stm32f0x
+LoRa.menu.pnum.ELEKTOR_F072C8.debug.server.openocd.scripts.2=target/stm32f0x.cfg
 LoRa.menu.pnum.ELEKTOR_F072C8.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
 
 # ELEKTOR_F072CB
@@ -13673,7 +12831,7 @@ LoRa.menu.pnum.ELEKTOR_F072CB.build.variant=STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)
 LoRa.menu.pnum.ELEKTOR_F072CB.build.variant_h=variant_ELEKTOR_F072Cx.h
 LoRa.menu.pnum.ELEKTOR_F072CB.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 LoRa.menu.pnum.ELEKTOR_F072CB.build.st_extra_flags=-D{build.product_line} {build.xSerial}
-LoRa.menu.pnum.ELEKTOR_F072CB.openocd.target=stm32f0x
+LoRa.menu.pnum.ELEKTOR_F072CB.debug.server.openocd.scripts.2=target/stm32f0x.cfg
 LoRa.menu.pnum.ELEKTOR_F072CB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
 
 # Upload menu
@@ -13682,11 +12840,6 @@ LoRa.menu.upload_method.swdMethod.upload.protocol=swd
 LoRa.menu.upload_method.swdMethod.upload.options=
 LoRa.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-LoRa.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-LoRa.menu.upload_method.jlinkMethod.upload.protocol=jlink
-LoRa.menu.upload_method.jlinkMethod.upload.options=
-LoRa.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 LoRa.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 LoRa.menu.upload_method.serialMethod.upload.protocol=serial
 LoRa.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -13697,18 +12850,6 @@ LoRa.menu.upload_method.dfuMethod.upload.protocol=dfu
 LoRa.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 LoRa.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-LoRa.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-LoRa.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-LoRa.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-LoRa.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-LoRa.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-LoRa.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-LoRa.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-LoRa.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-LoRa.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # Midatronics boards
 
@@ -13736,7 +12877,7 @@ Midatronics.menu.pnum.MKR_SHARKY.build.board=MKR_SHARKY
 Midatronics.menu.pnum.MKR_SHARKY.build.series=STM32WBxx
 Midatronics.menu.pnum.MKR_SHARKY.build.product_line=STM32WB55xx
 Midatronics.menu.pnum.MKR_SHARKY.build.variant=STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U
-Midatronics.menu.pnum.MKR_SHARKY.openocd.target=stm32wbx
+Midatronics.menu.pnum.MKR_SHARKY.debug.server.openocd.scripts.2=target/stm32wbx.cfg
 Midatronics.menu.pnum.MKR_SHARKY.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WBxx/STM32WB55_CM4.svd
 
 # Upload menu
@@ -13749,11 +12890,6 @@ Midatronics.menu.upload_method.swdMethod.upload.protocol=swd
 Midatronics.menu.upload_method.swdMethod.upload.options=
 Midatronics.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-Midatronics.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-Midatronics.menu.upload_method.jlinkMethod.upload.protocol=jlink
-Midatronics.menu.upload_method.jlinkMethod.upload.options=
-Midatronics.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 Midatronics.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 Midatronics.menu.upload_method.serialMethod.upload.protocol=serial
 Midatronics.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -13764,18 +12900,6 @@ Midatronics.menu.upload_method.dfuMethod.upload.protocol=dfu
 Midatronics.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 Midatronics.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-Midatronics.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-Midatronics.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-Midatronics.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-Midatronics.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-Midatronics.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-Midatronics.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-Midatronics.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-Midatronics.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-Midatronics.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # SparkFun Boards
 
@@ -13805,7 +12929,7 @@ SparkFun.menu.pnum.SFE_MMPB_STM32WB5MMG.build.variant=STM32WBxx/WB5MMGH
 SparkFun.menu.pnum.SFE_MMPB_STM32WB5MMG.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 SparkFun.menu.pnum.SFE_MMPB_STM32WB5MMG.vid.0=0x1B4F
 SparkFun.menu.pnum.SFE_MMPB_STM32WB5MMG.pid.0=0x0034
-SparkFun.menu.pnum.SFE_MMPB_STM32WB5MMG.openocd.target=stm32wbx
+SparkFun.menu.pnum.SFE_MMPB_STM32WB5MMG.debug.server.openocd.scripts.2=target/stm32wbx.cfg
 SparkFun.menu.pnum.SFE_MMPB_STM32WB5MMG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WBxx/STM32WB55_CM4.svd
 
 # SparkFun MicroMod STM32F405 Board
@@ -13823,7 +12947,7 @@ SparkFun.menu.pnum.MICROMOD_F405.build.variant=STM32F4xx/F405RGT_F415RGT
 SparkFun.menu.pnum.MICROMOD_F405.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 SparkFun.menu.pnum.MICROMOD_F405.vid.0=0x1B4F
 SparkFun.menu.pnum.MICROMOD_F405.pid.0=0x0029
-SparkFun.menu.pnum.MICROMOD_F405.openocd.target=stm32f4x
+SparkFun.menu.pnum.MICROMOD_F405.debug.server.openocd.scripts.2=target/stm32f4x.cfg
 SparkFun.menu.pnum.MICROMOD_F405.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F405.svd
 
 # Upload menu
@@ -13832,11 +12956,6 @@ SparkFun.menu.upload_method.swdMethod.upload.protocol=swd
 SparkFun.menu.upload_method.swdMethod.upload.options=
 SparkFun.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-SparkFun.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
-SparkFun.menu.upload_method.jlinkMethod.upload.protocol=jlink
-SparkFun.menu.upload_method.jlinkMethod.upload.options=
-SparkFun.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 SparkFun.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 SparkFun.menu.upload_method.serialMethod.upload.protocol=serial
 SparkFun.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -13847,18 +12966,6 @@ SparkFun.menu.upload_method.dfuMethod.upload.protocol=dfu
 SparkFun.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 SparkFun.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
-SparkFun.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
-SparkFun.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
-SparkFun.menu.upload_method.bmpMethod.upload.tool=bmp_upload
-
-SparkFun.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-SparkFun.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-SparkFun.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
-SparkFun.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-SparkFun.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-SparkFun.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
 ################################################################################
 # ELV Modular System boards
 
@@ -13881,7 +12988,7 @@ ELV_Modular_System.menu.pnum.ELV_BM_TRX1.build.variant=STM32WLxx/WL54JCI_WL55JCI
 ELV_Modular_System.menu.pnum.ELV_BM_TRX1.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 ELV_Modular_System.menu.pnum.ELV_BM_TRX1.build.flash_offset=0x800
 ELV_Modular_System.menu.pnum.ELV_BM_TRX1.build.st_extra_flags=-D{build.product_line} -DUSE_CM4_STARTUP_FILE {build.xSerial}
-ELV_Modular_System.menu.pnum.ELV_BM_TRX1.openocd.target=stm32wlx
+ELV_Modular_System.menu.pnum.ELV_BM_TRX1.debug.server.openocd.scripts.2=target/stm32wlx.cfg
 ELV_Modular_System.menu.pnum.ELV_BM_TRX1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WLxx/STM32WLE5_CM4.svd
 
 # Upload menu
@@ -13890,58 +12997,11 @@ ELV_Modular_System.menu.upload_method.swdMethod.upload.protocol=swd
 ELV_Modular_System.menu.upload_method.swdMethod.upload.options=
 ELV_Modular_System.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
-ELV_Modular_System.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link) with Bootloader
-ELV_Modular_System.menu.upload_method.jlinkMethod.upload.protocol=jlink
-ELV_Modular_System.menu.upload_method.jlinkMethod.upload.options=
-ELV_Modular_System.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
-
 ELV_Modular_System.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial) with Bootloader
 ELV_Modular_System.menu.upload_method.serialMethod.upload.protocol=serial
 ELV_Modular_System.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 ELV_Modular_System.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
-################################################################################
-# STeaMi board
-STeaMi.name=STeaMi Board
-STeaMi.build.core=arduino
-STeaMi.build.board=STeaMi
-STeaMi.build.variant_h=variant_{build.board}.h
-STeaMi.build.st_extra_flags=-D{build.product_line} {build.xSerial}
-STeaMi.build.flash_offset=0x0
-STeaMi.upload.maximum_size=0
-STeaMi.upload.maximum_data_size=0
-STeaMi.vid.0=0x0d28
-STeaMi.pid.0=0x0204
-
-STeaMi.menu.pnum.STEAM32_WB55RG=STeaMi
-STeaMi.menu.pnum.STEAM32_WB55RG.node="STeaMi,DAPLINK"
-STeaMi.menu.pnum.STEAM32_WB55RG.upload.maximum_size=524288
-STeaMi.menu.pnum.STEAM32_WB55RG.upload.maximum_data_size=196608
-STeaMi.menu.pnum.STEAM32_WB55RG.build.mcu=cortex-m4
-STeaMi.menu.pnum.STEAM32_WB55RG.build.fpu=-mfpu=fpv4-sp-d16
-STeaMi.menu.pnum.STEAM32_WB55RG.build.float-abi=-mfloat-abi=hard
-STeaMi.menu.pnum.STEAM32_WB55RG.build.board=STEAM32_WB55RG
-STeaMi.menu.pnum.STEAM32_WB55RG.build.series=STM32WBxx
-STeaMi.menu.pnum.STEAM32_WB55RG.build.product_line=STM32WB55xx
-STeaMi.menu.pnum.STEAM32_WB55RG.build.variant=STM32WBxx/WB55R(C-E-G)V
-STeaMi.menu.pnum.STEAM32_WB55RG.debug.server.openocd.scripts.0=interface/cmsis-dap.cfg
-STeaMi.menu.pnum.STEAM32_WB55RG.debug.server.openocd.scripts.1={runtime.platform.path}/debugger/select_swd.cfg
-STeaMi.menu.pnum.STEAM32_WB55RG.openocd.target=stm32wbx
-STeaMi.menu.pnum.STEAM32_WB55RG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WBxx/STM32WB55_CM4.svd
-
-# Upload menu
-STeaMi.menu.upload_method.MassStorage=Mass Storage
-STeaMi.menu.upload_method.MassStorage.upload.protocol=
-STeaMi.menu.upload_method.MassStorage.upload.tool=massStorageCopy
-
-STeaMi.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
-STeaMi.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
-STeaMi.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
-
-STeaMi.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
-STeaMi.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
-STeaMi.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
-
 ################################################################################
 # Serialx activation
 Nucleo_144.menu.xserial.generic=Enabled (generic 'Serial')
@@ -14078,12 +13138,6 @@ GenL5.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
 GenL5.menu.xserial.disabled=Disabled (no Serial support)
 GenL5.menu.xserial.disabled.build.xSerial=
 
-GenU0.menu.xserial.generic=Enabled (generic 'Serial')
-GenU0.menu.xserial.none=Enabled (no generic 'Serial')
-GenU0.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
-GenU0.menu.xserial.disabled=Disabled (no Serial support)
-GenU0.menu.xserial.disabled.build.xSerial=
-
 GenU5.menu.xserial.generic=Enabled (generic 'Serial')
 GenU5.menu.xserial.none=Enabled (no generic 'Serial')
 GenU5.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
@@ -14174,12 +13228,6 @@ ELV_Modular_System.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DH
 ELV_Modular_System.menu.xserial.disabled=Disabled (no Serial support)
 ELV_Modular_System.menu.xserial.disabled.build.xSerial=
 
-STeaMi.menu.xserial.generic=Enabled (generic 'Serial')
-STeaMi.menu.xserial.none=Enabled (no generic 'Serial')
-STeaMi.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
-STeaMi.menu.xserial.disabled=Disabled (no Serial support)
-STeaMi.menu.xserial.disabled.build.xSerial=
-
 # USB connectivity
 Nucleo_144.menu.usb.none=None
 Nucleo_144.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
@@ -14246,14 +13294,6 @@ Eval.menu.xusb.HS.build.usb_speed=-DUSE_USB_HS
 Eval.menu.xusb.HSFS=High Speed in Full Speed mode
 Eval.menu.xusb.HSFS.build.usb_speed=-DUSE_USB_HS -DUSE_USB_HS_IN_FS
 
-GenC0.menu.usb.none=None
-GenC0.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
-GenC0.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
-GenC0.menu.usb.CDC=CDC (no generic 'Serial')
-GenC0.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB
-GenC0.menu.usb.HID=HID (keyboard and mouse)
-GenC0.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
-
 GenF0.menu.usb.none=None
 GenF0.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
 GenF0.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
@@ -14327,14 +13367,6 @@ GenF7.menu.xusb.HS.build.usb_speed=-DUSE_USB_HS
 GenF7.menu.xusb.HSFS=High Speed in Full Speed mode
 GenF7.menu.xusb.HSFS.build.usb_speed=-DUSE_USB_HS -DUSE_USB_HS_IN_FS
 
-GenG0.menu.usb.none=None
-GenG0.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
-GenG0.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
-GenG0.menu.usb.CDC=CDC (no generic 'Serial')
-GenG0.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB
-GenG0.menu.usb.HID=HID (keyboard and mouse)
-GenG0.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
-
 GenG4.menu.usb.none=None
 GenG4.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
 GenG4.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
@@ -14348,6 +13380,14 @@ GenG4.menu.xusb.HS.build.usb_speed=-DUSE_USB_HS
 GenG4.menu.xusb.HSFS=High Speed in Full Speed mode
 GenG4.menu.xusb.HSFS.build.usb_speed=-DUSE_USB_HS -DUSE_USB_HS_IN_FS
 
+GenG0.menu.usb.none=None
+GenG0.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
+GenG0.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
+GenG0.menu.usb.CDC=CDC (no generic 'Serial')
+GenG0.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB
+GenG0.menu.usb.HID=HID (keyboard and mouse)
+GenG0.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
+
 GenH5.menu.usb.none=None
 GenH5.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
 GenH5.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
@@ -14416,14 +13456,6 @@ GenL5.menu.xusb.HS.build.usb_speed=-DUSE_USB_HS
 GenL5.menu.xusb.HSFS=High Speed in Full Speed mode
 GenL5.menu.xusb.HSFS.build.usb_speed=-DUSE_USB_HS -DUSE_USB_HS_IN_FS
 
-GenU0.menu.usb.none=None
-GenU0.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
-GenU0.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
-GenU0.menu.usb.CDC=CDC (no generic 'Serial')
-GenU0.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB
-GenU0.menu.usb.HID=HID (keyboard and mouse)
-GenU0.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
-
 GenU5.menu.usb.none=None
 GenU5.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
 GenU5.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
@@ -14965,27 +13997,6 @@ GenL5.menu.opt.ogstd.build.flags.optimize=-Og
 GenL5.menu.opt.o0std=No Optimization (-O0)
 GenL5.menu.opt.o0std.build.flags.optimize=-O0
 
-GenU0.menu.opt.osstd=Smallest (-Os default)
-GenU0.menu.opt.osstd.build.flags.optimize=-Os
-GenU0.menu.opt.oslto=Smallest (-Os) with LTO
-GenU0.menu.opt.oslto.build.flags.optimize=-Os -flto
-GenU0.menu.opt.o1std=Fast (-O1)
-GenU0.menu.opt.o1std.build.flags.optimize=-O1
-GenU0.menu.opt.o1lto=Fast (-O1) with LTO
-GenU0.menu.opt.o1lto.build.flags.optimize=-O1 -flto
-GenU0.menu.opt.o2std=Faster (-O2)
-GenU0.menu.opt.o2std.build.flags.optimize=-O2
-GenU0.menu.opt.o2lto=Faster (-O2) with LTO
-GenU0.menu.opt.o2lto.build.flags.optimize=-O2 -flto
-GenU0.menu.opt.o3std=Fastest (-O3)
-GenU0.menu.opt.o3std.build.flags.optimize=-O3
-GenU0.menu.opt.o3lto=Fastest (-O3) with LTO
-GenU0.menu.opt.o3lto.build.flags.optimize=-O3 -flto
-GenU0.menu.opt.ogstd=Debug (-Og)
-GenU0.menu.opt.ogstd.build.flags.optimize=-Og
-GenU0.menu.opt.o0std=No Optimization (-O0)
-GenU0.menu.opt.o0std.build.flags.optimize=-O0
-
 GenU5.menu.opt.osstd=Smallest (-Os default)
 GenU5.menu.opt.osstd.build.flags.optimize=-Os
 GenU5.menu.opt.oslto=Smallest (-Os) with LTO
@@ -15287,26 +14298,6 @@ ELV_Modular_System.menu.opt.ogstd.build.flags.optimize=-Og
 ELV_Modular_System.menu.opt.o0std=No Optimization (-O0)
 ELV_Modular_System.menu.opt.o0std.build.flags.optimize=-O0
 
-STeaMi.menu.opt.osstd=Smallest (-Os default)
-STeaMi.menu.opt.oslto=Smallest (-Os) with LTO
-STeaMi.menu.opt.oslto.build.flags.optimize=-Os -flto
-STeaMi.menu.opt.o1std=Fast (-O1)
-STeaMi.menu.opt.o1std.build.flags.optimize=-O1
-STeaMi.menu.opt.o1lto=Fast (-O1) with LTO
-STeaMi.menu.opt.o1lto.build.flags.optimize=-O1 -flto
-STeaMi.menu.opt.o2std=Faster (-O2)
-STeaMi.menu.opt.o2std.build.flags.optimize=-O2
-STeaMi.menu.opt.o2lto=Faster (-O2) with LTO
-STeaMi.menu.opt.o2lto.build.flags.optimize=-O2 -flto
-STeaMi.menu.opt.o3std=Fastest (-O3)
-STeaMi.menu.opt.o3std.build.flags.optimize=-O3
-STeaMi.menu.opt.o3lto=Fastest (-O3) with LTO
-STeaMi.menu.opt.o3lto.build.flags.optimize=-O3 -flto
-STeaMi.menu.opt.ogstd=Debug (-Og)
-STeaMi.menu.opt.ogstd.build.flags.optimize=-Og
-STeaMi.menu.opt.o0std=No Optimization (-O0)
-STeaMi.menu.opt.o0std.build.flags.optimize=-O0
-
 # Debug information
 Nucleo_144.menu.dbg.none=None
 Nucleo_144.menu.dbg.enable_sym=Symbols Enabled (-g)
@@ -15472,22 +14463,6 @@ GenL5.menu.dbg.enable_log.build.flags.debug=
 GenL5.menu.dbg.enable_all=Core Logs and Symbols Enabled (-g)
 GenL5.menu.dbg.enable_all.build.flags.debug=-g
 
-GenU0.menu.dbg.none=None
-GenU0.menu.dbg.enable_sym=Symbols Enabled (-g)
-GenU0.menu.dbg.enable_sym.build.flags.debug=-g -DNDEBUG
-GenU0.menu.dbg.enable_log=Core logs Enabled
-GenU0.menu.dbg.enable_log.build.flags.debug=
-GenU0.menu.dbg.enable_all=Core Logs and Symbols Enabled (-g)
-GenU0.menu.dbg.enable_all.build.flags.debug=-g
-
-GenU5.menu.dbg.none=None
-GenU5.menu.dbg.enable_sym=Symbols Enabled (-g)
-GenU5.menu.dbg.enable_sym.build.flags.debug=-g -DNDEBUG
-GenU5.menu.dbg.enable_log=Core logs Enabled
-GenU5.menu.dbg.enable_log.build.flags.debug=
-GenU5.menu.dbg.enable_all=Core Logs and Symbols Enabled (-g)
-GenU5.menu.dbg.enable_all.build.flags.debug=-g
-
 GenWB.menu.dbg.none=None
 GenWB.menu.dbg.enable_sym=Symbols Enabled (-g)
 GenWB.menu.dbg.enable_sym.build.flags.debug=-g -DNDEBUG
@@ -15600,14 +14575,6 @@ ELV_Modular_System.menu.dbg.enable_log.build.flags.debug=
 ELV_Modular_System.menu.dbg.enable_all=Core Logs and Symbols Enabled (-g)
 ELV_Modular_System.menu.dbg.enable_all.build.flags.debug=-g
 
-STeaMi.menu.dbg.none=None
-STeaMi.menu.dbg.enable_sym=Symbols Enabled (-g)
-STeaMi.menu.dbg.enable_sym.build.flags.debug=-g -DNDEBUG
-STeaMi.menu.dbg.enable_log=Core logs Enabled
-STeaMi.menu.dbg.enable_log.build.flags.debug=
-STeaMi.menu.dbg.enable_all=Core Logs and Symbols Enabled (-g)
-STeaMi.menu.dbg.enable_all.build.flags.debug=-g
-
 # C Runtime Library
 Nucleo_144.menu.rtlib.nano=Newlib Nano (default)
 Nucleo_144.menu.rtlib.nanofp=Newlib Nano + Float Printf
@@ -15819,16 +14786,6 @@ GenL5.menu.rtlib.nanofps.build.flags.ldspecs=--specs=nano.specs -u _printf_float
 GenL5.menu.rtlib.full=Newlib Standard
 GenL5.menu.rtlib.full.build.flags.ldspecs=
 
-GenU0.menu.rtlib.nano=Newlib Nano (default)
-GenU0.menu.rtlib.nanofp=Newlib Nano + Float Printf
-GenU0.menu.rtlib.nanofp.build.flags.ldspecs=--specs=nano.specs -u _printf_float
-GenU0.menu.rtlib.nanofs=Newlib Nano + Float Scanf
-GenU0.menu.rtlib.nanofs.build.flags.ldspecs=--specs=nano.specs -u _scanf_float
-GenU0.menu.rtlib.nanofps=Newlib Nano + Float Printf/Scanf
-GenU0.menu.rtlib.nanofps.build.flags.ldspecs=--specs=nano.specs -u _printf_float -u _scanf_float
-GenU0.menu.rtlib.full=Newlib Standard
-GenU0.menu.rtlib.full.build.flags.ldspecs=
-
 GenU5.menu.rtlib.nano=Newlib Nano (default)
 GenU5.menu.rtlib.nanofp=Newlib Nano + Float Printf
 GenU5.menu.rtlib.nanofp.build.flags.ldspecs=--specs=nano.specs -u _printf_float
@@ -15978,13 +14935,3 @@ ELV_Modular_System.menu.rtlib.nanofps=Newlib Nano + Float Printf/Scanf
 ELV_Modular_System.menu.rtlib.nanofps.build.flags.ldspecs=--specs=nano.specs -u _printf_float -u _scanf_float
 ELV_Modular_System.menu.rtlib.full=Newlib Standard
 ELV_Modular_System.menu.rtlib.full.build.flags.ldspecs=
-
-STeaMi.menu.rtlib.nano=Newlib Nano (default)
-STeaMi.menu.rtlib.nanofp=Newlib Nano + Float Printf
-STeaMi.menu.rtlib.nanofp.build.flags.ldspecs=--specs=nano.specs -u _printf_float
-STeaMi.menu.rtlib.nanofs=Newlib Nano + Float Scanf
-STeaMi.menu.rtlib.nanofs.build.flags.ldspecs=--specs=nano.specs -u _scanf_float
-STeaMi.menu.rtlib.nanofps=Newlib Nano + Float Printf/Scanf
-STeaMi.menu.rtlib.nanofps.build.flags.ldspecs=--specs=nano.specs -u _printf_float -u _scanf_float
-STeaMi.menu.rtlib.full=Newlib Standard
-STeaMi.menu.rtlib.full.build.flags.ldspecs=

From 4806e93dd983ff6eb46156d4430fe0169fb39d55 Mon Sep 17 00:00:00 2001
From: jackb60 <40903548+jackb60@users.noreply.github.com>
Date: Sun, 2 Feb 2025 19:53:01 -0500
Subject: [PATCH 02/10] Add STM32F042K6U6 Support

Signed-off-by: jackb60 <40903548+jackb60@users.noreply.github.com>
---
 variants/STM32F0xx/F042K(4-6)U/ldscript.ld | 187 +++++++++++++++++++++
 1 file changed, 187 insertions(+)
 create mode 100644 variants/STM32F0xx/F042K(4-6)U/ldscript.ld

diff --git a/variants/STM32F0xx/F042K(4-6)U/ldscript.ld b/variants/STM32F0xx/F042K(4-6)U/ldscript.ld
new file mode 100644
index 0000000000..37f8a5fd91
--- /dev/null
+++ b/variants/STM32F0xx/F042K(4-6)U/ldscript.ld
@@ -0,0 +1,187 @@
+/*
+******************************************************************************
+**
+** @file        : LinkerScript.ld
+**
+** @author      : Auto-generated by STM32CubeIDE
+**
+** @brief       : Linker script for STM32F042K6Ux Device from STM32F0 series
+**                      32KBytes FLASH
+**                      6KBytes RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used
+**
+**  Target      : STMicroelectronics STM32
+**
+**  Distribution: The file is distributed as is, without any warranty
+**                of any kind.
+**
+******************************************************************************
+** @attention
+**
+** Copyright (c) 2025 STMicroelectronics.
+** All rights reserved.
+**
+** This software is licensed under terms that can be found in the LICENSE file
+** in the root directory of this software component.
+** If no LICENSE file comes with this software, it is provided AS-IS.
+**
+******************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = ORIGIN(RAM) + LENGTH(RAM); /* end of "RAM" Ram type memory */
+
+_Min_Heap_Size = 0x200; /* required amount of heap */
+_Min_Stack_Size = 0x400; /* required amount of stack */
+
+/* Memories definition */
+MEMORY
+{
+  RAM    (xrw)    : ORIGIN = 0x20000000,   LENGTH = LD_MAX_DATA_SIZE
+  FLASH    (rx)    : ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
+}
+
+/* Sections */
+SECTIONS
+{
+  /* The startup code into "FLASH" Rom type memory */
+  .isr_vector :
+  {
+    . = ALIGN(4);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(4);
+  } >FLASH
+
+  /* The program code and other data into "FLASH" Rom type memory */
+  .text :
+  {
+    . = ALIGN(4);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(4);
+    _etext = .;        /* define a global symbols at end of code */
+  } >FLASH
+
+  /* Constant data into "FLASH" Rom type memory */
+  .rodata :
+  {
+    . = ALIGN(4);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM.extab (READONLY) : /* The "READONLY" keyword is only supported in GCC11 and later, remove it if using GCC10 or earlier. */
+  {
+    . = ALIGN(4);
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM (READONLY) : /* The "READONLY" keyword is only supported in GCC11 and later, remove it if using GCC10 or earlier. */
+  {
+    . = ALIGN(4);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+    . = ALIGN(4);
+  } >FLASH
+
+  .preinit_array (READONLY) : /* The "READONLY" keyword is only supported in GCC11 and later, remove it if using GCC10 or earlier. */
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  .init_array (READONLY) : /* The "READONLY" keyword is only supported in GCC11 and later, remove it if using GCC10 or earlier. */
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  .fini_array (READONLY) : /* The "READONLY" keyword is only supported in GCC11 and later, remove it if using GCC10 or earlier. */
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  /* Used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections into "RAM" Ram type memory */
+  .data :
+  {
+    . = ALIGN(4);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
+
+    . = ALIGN(4);
+    _edata = .;        /* define a global symbol at data end */
+
+  } >RAM AT> FLASH
+
+  /* Uninitialized data section into "RAM" Ram type memory */
+  . = ALIGN(4);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(4);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >RAM
+
+  /* User_heap_stack section, used to check that there is enough "RAM" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >RAM
+
+  /* Remove information from the compiler libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}

From 0a52060101ec60e33e2de1df0f5a1f465d28e6c6 Mon Sep 17 00:00:00 2001
From: jackb60 <40903548+jackb60@users.noreply.github.com>
Date: Sun, 2 Feb 2025 19:54:54 -0500
Subject: [PATCH 03/10] Add STM32F042K6U6 Support

Signed-off-by: jackb60 <40903548+jackb60@users.noreply.github.com>
---
 .../STM32F0xx/F042K(4-6)U/generic_clock.c     | 41 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/variants/STM32F0xx/F042K(4-6)U/generic_clock.c b/variants/STM32F0xx/F042K(4-6)U/generic_clock.c
index 691a010770..a5ac5e2822 100644
--- a/variants/STM32F0xx/F042K(4-6)U/generic_clock.c
+++ b/variants/STM32F0xx/F042K(4-6)U/generic_clock.c
@@ -20,8 +20,45 @@
   */
 WEAK void SystemClock_Config(void)
 {
-  /* SystemClock_Config can be generated by STM32CubeMX */
-#warning "SystemClock_Config() is empty. Default clock at reset is used."
+  RCC_OscInitTypeDef RCC_OscInitStruct = {};
+  RCC_ClkInitTypeDef RCC_ClkInitStruct = {};
+  RCC_PeriphCLKInitTypeDef PeriphClkInit = {};
+
+  /** Initializes the RCC Oscillators according to the specified parameters
+  * in the RCC_OscInitTypeDef structure.
+  */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI|RCC_OSCILLATORTYPE_HSI48;
+  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
+  RCC_OscInitStruct.HSI48State = RCC_HSI48_ON;
+  RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /** Initializes the CPU, AHB and APB buses clocks
+  */
+  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
+                              |RCC_CLOCKTYPE_PCLK1;
+  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSI48;
+  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
+
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USB|RCC_PERIPHCLK_USART1
+                              |RCC_PERIPHCLK_I2C1;
+  PeriphClkInit.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK1;
+  PeriphClkInit.I2c1ClockSelection = RCC_I2C1CLKSOURCE_HSI;
+  PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_HSI48;
+
+  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
+  {
+    Error_Handler();
+  }
 }
 
 #endif /* ARDUINO_GENERIC_* */

From c1eb43eba5e2d020234da5dd80c0b75301ad4fd0 Mon Sep 17 00:00:00 2001
From: jackb60 <40903548+jackb60@users.noreply.github.com>
Date: Sun, 2 Feb 2025 19:59:24 -0500
Subject: [PATCH 04/10] Update boards.txt

Signed-off-by: jackb60 <40903548+jackb60@users.noreply.github.com>
---
 boards.txt | 1518 ++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 1290 insertions(+), 228 deletions(-)

diff --git a/boards.txt b/boards.txt
index 9ec4073203..189a8cac84 100644
--- a/boards.txt
+++ b/boards.txt
@@ -52,7 +52,7 @@ Nucleo_144.menu.pnum.NUCLEO_F207ZG.build.series=STM32F2xx
 Nucleo_144.menu.pnum.NUCLEO_F207ZG.build.product_line=STM32F207xx
 Nucleo_144.menu.pnum.NUCLEO_F207ZG.build.variant=STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T
 Nucleo_144.menu.pnum.NUCLEO_F207ZG.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Nucleo_144.menu.pnum.NUCLEO_F207ZG.debug.server.openocd.scripts.2=target/stm32f2x.cfg
+Nucleo_144.menu.pnum.NUCLEO_F207ZG.openocd.target=stm32f2x
 Nucleo_144.menu.pnum.NUCLEO_F207ZG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F2xx/STM32F217.svd
 
 # NUCLEO_F412ZG board
@@ -67,7 +67,7 @@ Nucleo_144.menu.pnum.NUCLEO_F412ZG.build.board=NUCLEO_F412ZG
 Nucleo_144.menu.pnum.NUCLEO_F412ZG.build.series=STM32F4xx
 Nucleo_144.menu.pnum.NUCLEO_F412ZG.build.product_line=STM32F412Zx
 Nucleo_144.menu.pnum.NUCLEO_F412ZG.build.variant=STM32F4xx/F412Z(E-G)(J-T)
-Nucleo_144.menu.pnum.NUCLEO_F412ZG.debug.server.openocd.scripts.2=target/stm32f4x.cfg
+Nucleo_144.menu.pnum.NUCLEO_F412ZG.openocd.target=stm32f4x
 Nucleo_144.menu.pnum.NUCLEO_F412ZG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F412.svd
 
 # NUCLEO_F413ZH board
@@ -82,7 +82,7 @@ Nucleo_144.menu.pnum.NUCLEO_F413ZH.build.board=NUCLEO_F413ZH
 Nucleo_144.menu.pnum.NUCLEO_F413ZH.build.series=STM32F4xx
 Nucleo_144.menu.pnum.NUCLEO_F413ZH.build.product_line=STM32F413xx
 Nucleo_144.menu.pnum.NUCLEO_F413ZH.build.variant=STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)
-Nucleo_144.menu.pnum.NUCLEO_F413ZH.debug.server.openocd.scripts.2=target/stm32f4x.cfg
+Nucleo_144.menu.pnum.NUCLEO_F413ZH.openocd.target=stm32f4x
 Nucleo_144.menu.pnum.NUCLEO_F413ZH.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F413.svd
 
 # NUCLEO_F429ZI board
@@ -99,7 +99,8 @@ Nucleo_144.menu.pnum.NUCLEO_F429ZI.build.series=STM32F4xx
 Nucleo_144.menu.pnum.NUCLEO_F429ZI.build.product_line=STM32F429xx
 Nucleo_144.menu.pnum.NUCLEO_F429ZI.build.variant=STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)
 Nucleo_144.menu.pnum.NUCLEO_F429ZI.build.variant_h=variant_NUCLEO_F4x9ZI.h
-Nucleo_144.menu.pnum.NUCLEO_F429ZI.debug.server.openocd.scripts.2=target/stm32f4x.cfg
+Nucleo_144.menu.pnum.NUCLEO_F429ZI.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
+Nucleo_144.menu.pnum.NUCLEO_F429ZI.openocd.target=stm32f4x
 Nucleo_144.menu.pnum.NUCLEO_F429ZI.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F429.svd
 
 # NUCLEO_F439ZI board
@@ -115,7 +116,8 @@ Nucleo_144.menu.pnum.NUCLEO_F439ZI.build.series=STM32F4xx
 Nucleo_144.menu.pnum.NUCLEO_F439ZI.build.product_line=STM32F439xx
 Nucleo_144.menu.pnum.NUCLEO_F439ZI.build.variant=STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)
 Nucleo_144.menu.pnum.NUCLEO_F439ZI.build.variant_h=variant_NUCLEO_F4x9ZI.h
-Nucleo_144.menu.pnum.NUCLEO_F439ZI.debug.server.openocd.scripts.2=target/stm32f4x.cfg
+Nucleo_144.menu.pnum.NUCLEO_F439ZI.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
+Nucleo_144.menu.pnum.NUCLEO_F439ZI.openocd.target=stm32f4x
 Nucleo_144.menu.pnum.NUCLEO_F439ZI.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F439.svd
 
 # NUCLEO_F446RE board
@@ -130,7 +132,7 @@ Nucleo_144.menu.pnum.NUCLEO_F446ZE.build.board=NUCLEO_F446ZE
 Nucleo_144.menu.pnum.NUCLEO_F446ZE.build.series=STM32F4xx
 Nucleo_144.menu.pnum.NUCLEO_F446ZE.build.product_line=STM32F446xx
 Nucleo_144.menu.pnum.NUCLEO_F446ZE.build.variant=STM32F4xx/F446Z(C-E)(H-J-T)
-Nucleo_144.menu.pnum.NUCLEO_F446ZE.debug.server.openocd.scripts.2=target/stm32f4x.cfg
+Nucleo_144.menu.pnum.NUCLEO_F446ZE.openocd.target=stm32f4x
 Nucleo_144.menu.pnum.NUCLEO_F446ZE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F446.svd
 
 # NUCLEO_F722ZE board
@@ -145,7 +147,7 @@ Nucleo_144.menu.pnum.NUCLEO_F722ZE.build.series=STM32F7xx
 Nucleo_144.menu.pnum.NUCLEO_F722ZE.build.product_line=STM32F722xx
 Nucleo_144.menu.pnum.NUCLEO_F722ZE.build.variant=STM32F7xx/F722Z(C-E)T_F732ZET
 Nucleo_144.menu.pnum.NUCLEO_F722ZE.build.variant_h=variant_NUCLEO_F722ZE.h
-Nucleo_144.menu.pnum.NUCLEO_F722ZE.debug.server.openocd.scripts.2=target/stm32f7x.cfg
+Nucleo_144.menu.pnum.NUCLEO_F722ZE.openocd.target=stm32f7x
 Nucleo_144.menu.pnum.NUCLEO_F722ZE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F7xx/STM32F722.svd
 
 # NUCLEO_F746ZG board
@@ -161,7 +163,7 @@ Nucleo_144.menu.pnum.NUCLEO_F746ZG.build.series=STM32F7xx
 Nucleo_144.menu.pnum.NUCLEO_F746ZG.build.product_line=STM32F746xx
 Nucleo_144.menu.pnum.NUCLEO_F746ZG.build.variant=STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)
 Nucleo_144.menu.pnum.NUCLEO_F746ZG.build.variant_h=variant_NUCLEO_F7x6ZG.h
-Nucleo_144.menu.pnum.NUCLEO_F746ZG.debug.server.openocd.scripts.2=target/stm32f7x.cfg
+Nucleo_144.menu.pnum.NUCLEO_F746ZG.openocd.target=stm32f7x
 Nucleo_144.menu.pnum.NUCLEO_F746ZG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F7xx/STM32F746.svd
 
 # NUCLEO_F756ZG board
@@ -177,7 +179,7 @@ Nucleo_144.menu.pnum.NUCLEO_F756ZG.build.series=STM32F7xx
 Nucleo_144.menu.pnum.NUCLEO_F756ZG.build.product_line=STM32F756xx
 Nucleo_144.menu.pnum.NUCLEO_F756ZG.build.variant=STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)
 Nucleo_144.menu.pnum.NUCLEO_F756ZG.build.variant_h=variant_NUCLEO_F7x6ZG.h
-Nucleo_144.menu.pnum.NUCLEO_F756ZG.debug.server.openocd.scripts.2=target/stm32f7x.cfg
+Nucleo_144.menu.pnum.NUCLEO_F756ZG.openocd.target=stm32f7x
 Nucleo_144.menu.pnum.NUCLEO_F756ZG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F7xx/STM32F756.svd
 
 # NUCLEO_F767ZI board
@@ -192,7 +194,7 @@ Nucleo_144.menu.pnum.NUCLEO_F767ZI.build.board=NUCLEO_F767ZI
 Nucleo_144.menu.pnum.NUCLEO_F767ZI.build.series=STM32F7xx
 Nucleo_144.menu.pnum.NUCLEO_F767ZI.build.product_line=STM32F767xx
 Nucleo_144.menu.pnum.NUCLEO_F767ZI.build.variant=STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT
-Nucleo_144.menu.pnum.NUCLEO_F767ZI.debug.server.openocd.scripts.2=target/stm32f7x.cfg
+Nucleo_144.menu.pnum.NUCLEO_F767ZI.openocd.target=stm32f7x
 Nucleo_144.menu.pnum.NUCLEO_F767ZI.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F7xx/STM32F767.svd
 
 # NUCLEO H563ZI
@@ -207,7 +209,7 @@ Nucleo_144.menu.pnum.NUCLEO_H563ZI.build.board=NUCLEO_H563ZI
 Nucleo_144.menu.pnum.NUCLEO_H563ZI.build.series=STM32H5xx
 Nucleo_144.menu.pnum.NUCLEO_H563ZI.build.product_line=STM32H563xx
 Nucleo_144.menu.pnum.NUCLEO_H563ZI.build.variant=STM32H5xx/H563Z(G-I)T_H573ZIT
-Nucleo_144.menu.pnum.NUCLEO_H563ZI.debug.server.openocd.scripts.2=target/stm32h5x.cfg
+Nucleo_144.menu.pnum.NUCLEO_H563ZI.openocd.target=stm32h5x
 Nucleo_144.menu.pnum.NUCLEO_H563ZI.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H5xx/STM32H563.svd
 
 # NUCLEO H723ZG board
@@ -222,7 +224,7 @@ Nucleo_144.menu.pnum.NUCLEO_H723ZG.build.board=NUCLEO_H723ZG
 Nucleo_144.menu.pnum.NUCLEO_H723ZG.build.series=STM32H7xx
 Nucleo_144.menu.pnum.NUCLEO_H723ZG.build.product_line=STM32H723xx
 Nucleo_144.menu.pnum.NUCLEO_H723ZG.build.variant=STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT
-Nucleo_144.menu.pnum.NUCLEO_H723ZG.debug.server.openocd.scripts.2=target/stm32h7x.cfg
+Nucleo_144.menu.pnum.NUCLEO_H723ZG.openocd.target=stm32h7x
 Nucleo_144.menu.pnum.NUCLEO_H723ZG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H723.svd
 
 # NUCLEO_H743ZI board
@@ -237,7 +239,7 @@ Nucleo_144.menu.pnum.NUCLEO_H743ZI.build.board=NUCLEO_H743ZI
 Nucleo_144.menu.pnum.NUCLEO_H743ZI.build.series=STM32H7xx
 Nucleo_144.menu.pnum.NUCLEO_H743ZI.build.product_line=STM32H743xx
 Nucleo_144.menu.pnum.NUCLEO_H743ZI.build.variant=STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT
-Nucleo_144.menu.pnum.NUCLEO_H743ZI.debug.server.openocd.scripts.2=target/stm32h7x.cfg
+Nucleo_144.menu.pnum.NUCLEO_H743ZI.openocd.target=stm32h7x
 Nucleo_144.menu.pnum.NUCLEO_H743ZI.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H743.svd
 
 Nucleo_144.menu.pnum.NUCLEO_H743ZI2=Nucleo H743ZI2
@@ -252,7 +254,7 @@ Nucleo_144.menu.pnum.NUCLEO_H743ZI2.build.series=STM32H7xx
 Nucleo_144.menu.pnum.NUCLEO_H743ZI2.build.product_line=STM32H743xx
 Nucleo_144.menu.pnum.NUCLEO_H743ZI2.build.variant=STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT
 Nucleo_144.menu.pnum.NUCLEO_H743ZI2.build.variant_h=variant_NUCLEO_H743ZI.h
-Nucleo_144.menu.pnum.NUCLEO_H743ZI2.debug.server.openocd.scripts.2=target/stm32h7x.cfg
+Nucleo_144.menu.pnum.NUCLEO_H743ZI2.openocd.target=stm32h7x
 Nucleo_144.menu.pnum.NUCLEO_H743ZI2.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H743.svd
 
 # NUCLEO_H753ZI board
@@ -268,9 +270,25 @@ Nucleo_144.menu.pnum.NUCLEO_H753ZI.build.series=STM32H7xx
 Nucleo_144.menu.pnum.NUCLEO_H753ZI.build.product_line=STM32H753xx
 Nucleo_144.menu.pnum.NUCLEO_H753ZI.build.variant=STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT
 Nucleo_144.menu.pnum.NUCLEO_H753ZI.build.variant_h=variant_NUCLEO_H753ZI.h
-Nucleo_144.menu.pnum.NUCLEO_H753ZI.debug.server.openocd.scripts.2=target/stm32h7x.cfg
+Nucleo_144.menu.pnum.NUCLEO_H753ZI.openocd.target=stm32h7x
 Nucleo_144.menu.pnum.NUCLEO_H753ZI.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H753.svd
 
+# NUCLEO_H7A3ZI_Q
+Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q=Nucleo H7A3ZI-Q
+Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.node=NOD_H7A3ZIQ
+Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.upload.maximum_size=2097152
+Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.upload.maximum_data_size=1048576
+Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.build.mcu=cortex-m7
+Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.build.fpu=-mfpu=fpv4-sp-d16
+Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.build.float-abi=-mfloat-abi=hard
+Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.build.board=NUCLEO_H7A3ZI_Q
+Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.build.series=STM32H7xx
+Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.build.product_line=STM32H7A3xxQ
+Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.build.variant=STM32H7xx/H7A3Z(G-I)TxQ_H7B3ZITxQ
+Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.build.variant_h=variant_NUCLEO_H7A3ZI_Q.h
+Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.openocd.target=stm32h7x
+Nucleo_144.menu.pnum.NUCLEO_H7A3ZI_Q.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H7A3.svd
+
 # NUCLEO_L496ZG board
 Nucleo_144.menu.pnum.NUCLEO_L496ZG=Nucleo L496ZG
 Nucleo_144.menu.pnum.NUCLEO_L496ZG.node=NODE_L496ZG
@@ -283,7 +301,7 @@ Nucleo_144.menu.pnum.NUCLEO_L496ZG.build.board=NUCLEO_L496ZG
 Nucleo_144.menu.pnum.NUCLEO_L496ZG.build.series=STM32L4xx
 Nucleo_144.menu.pnum.NUCLEO_L496ZG.build.product_line=STM32L496xx
 Nucleo_144.menu.pnum.NUCLEO_L496ZG.build.variant=STM32L4xx/L496Z(E-G)T_L4A6ZGT
-Nucleo_144.menu.pnum.NUCLEO_L496ZG.debug.server.openocd.scripts.2=target/stm32l4x.cfg
+Nucleo_144.menu.pnum.NUCLEO_L496ZG.openocd.target=stm32l4x
 Nucleo_144.menu.pnum.NUCLEO_L496ZG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L496.svd
 
 # NUCLEO_L496ZG-P board
@@ -298,7 +316,7 @@ Nucleo_144.menu.pnum.NUCLEO_L496ZG-P.build.board=NUCLEO_L496ZG_P
 Nucleo_144.menu.pnum.NUCLEO_L496ZG-P.build.series=STM32L4xx
 Nucleo_144.menu.pnum.NUCLEO_L496ZG-P.build.product_line=STM32L496xx
 Nucleo_144.menu.pnum.NUCLEO_L496ZG-P.build.variant=STM32L4xx/L496ZGTxP_L4A6ZGTxP
-Nucleo_144.menu.pnum.NUCLEO_L496ZG-P.debug.server.openocd.scripts.2=target/stm32l4x.cfg
+Nucleo_144.menu.pnum.NUCLEO_L496ZG-P.openocd.target=stm32l4x
 Nucleo_144.menu.pnum.NUCLEO_L496ZG-P.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L496.svd
 
 # NUCLEO_L4R5ZI board
@@ -313,7 +331,7 @@ Nucleo_144.menu.pnum.NUCLEO_L4R5ZI.build.board=NUCLEO_L4R5ZI
 Nucleo_144.menu.pnum.NUCLEO_L4R5ZI.build.series=STM32L4xx
 Nucleo_144.menu.pnum.NUCLEO_L4R5ZI.build.product_line=STM32L4R5xx
 Nucleo_144.menu.pnum.NUCLEO_L4R5ZI.build.variant=STM32L4xx/L4R5Z(G-I)T_L4R7ZIT_L4S5ZIT_L4S7ZIT
-Nucleo_144.menu.pnum.NUCLEO_L4R5ZI.debug.server.openocd.scripts.2=target/stm32l4x.cfg
+Nucleo_144.menu.pnum.NUCLEO_L4R5ZI.openocd.target=stm32l4x
 Nucleo_144.menu.pnum.NUCLEO_L4R5ZI.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4R5.svd
 
 # NUCLEO_L4R5ZI-P board
@@ -328,7 +346,7 @@ Nucleo_144.menu.pnum.NUCLEO_L4R5ZI_P.build.board=NUCLEO_L4R5ZI_P
 Nucleo_144.menu.pnum.NUCLEO_L4R5ZI_P.build.series=STM32L4xx
 Nucleo_144.menu.pnum.NUCLEO_L4R5ZI_P.build.product_line=STM32L4R5xx
 Nucleo_144.menu.pnum.NUCLEO_L4R5ZI_P.build.variant=STM32L4xx/L4R5ZITxP
-Nucleo_144.menu.pnum.NUCLEO_L4R5ZI_P.debug.server.openocd.scripts.2=target/stm32l4x.cfg
+Nucleo_144.menu.pnum.NUCLEO_L4R5ZI_P.openocd.target=stm32l4x
 Nucleo_144.menu.pnum.NUCLEO_L4R5ZI_P.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4R5.svd
 
 # NUCLEO_L552ZE-Q board
@@ -343,7 +361,7 @@ Nucleo_144.menu.pnum.NUCLEO_L552ZE_Q.build.board=NUCLEO_L552ZE_Q
 Nucleo_144.menu.pnum.NUCLEO_L552ZE_Q.build.series=STM32L5xx
 Nucleo_144.menu.pnum.NUCLEO_L552ZE_Q.build.product_line=STM32L552xx
 Nucleo_144.menu.pnum.NUCLEO_L552ZE_Q.build.variant=STM32L5xx/L552Z(C-E)TxQ_L562ZETxQ
-Nucleo_144.menu.pnum.NUCLEO_L552ZE_Q.debug.server.openocd.scripts.2=target/stm32l5x.cfg
+Nucleo_144.menu.pnum.NUCLEO_L552ZE_Q.openocd.target=stm32l5x
 Nucleo_144.menu.pnum.NUCLEO_L552ZE_Q.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L5xx/STM32L552.svd
 
 # NUCLEO_U575ZI_Q board
@@ -359,7 +377,7 @@ Nucleo_144.menu.pnum.NUCLEO_U575ZI_Q.build.series=STM32U5xx
 Nucleo_144.menu.pnum.NUCLEO_U575ZI_Q.build.product_line=STM32U575xx
 Nucleo_144.menu.pnum.NUCLEO_U575ZI_Q.build.variant=STM32U5xx/U575Z(G-I)TxQ_U585ZITxQ
 Nucleo_144.menu.pnum.NUCLEO_U575ZI_Q.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Nucleo_144.menu.pnum.NUCLEO_U575ZI_Q.debug.server.openocd.scripts.2=target/stm32u5x.cfg
+Nucleo_144.menu.pnum.NUCLEO_U575ZI_Q.openocd.target=stm32u5x
 Nucleo_144.menu.pnum.NUCLEO_U575ZI_Q.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U5xx/STM32U575.svd
 
 # Upload menu
@@ -372,6 +390,11 @@ Nucleo_144.menu.upload_method.swdMethod.upload.protocol=swd
 Nucleo_144.menu.upload_method.swdMethod.upload.options=
 Nucleo_144.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+Nucleo_144.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+Nucleo_144.menu.upload_method.jlinkMethod.upload.protocol=jlink
+Nucleo_144.menu.upload_method.jlinkMethod.upload.options=
+Nucleo_144.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 Nucleo_144.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 Nucleo_144.menu.upload_method.serialMethod.upload.protocol=serial
 Nucleo_144.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -382,6 +405,18 @@ Nucleo_144.menu.upload_method.dfuMethod.upload.protocol=dfu
 Nucleo_144.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 Nucleo_144.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+Nucleo_144.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+Nucleo_144.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+Nucleo_144.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+Nucleo_144.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+Nucleo_144.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+Nucleo_144.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+Nucleo_144.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+Nucleo_144.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+Nucleo_144.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # Nucleo 64 boards
 
@@ -423,9 +458,23 @@ Nucleo_64.menu.pnum.NUCLEO_C031C6.build.series=STM32C0xx
 Nucleo_64.menu.pnum.NUCLEO_C031C6.build.product_line=STM32C031xx
 Nucleo_64.menu.pnum.NUCLEO_C031C6.build.variant=STM32C0xx/C031C(4-6)(T-U)
 Nucleo_64.menu.pnum.NUCLEO_C031C6.build.st_extra_flags=-D{build.product_line} {build.xSerial} -D__CORTEX_SC=0
-Nucleo_64.menu.pnum.NUCLEO_C031C6.debug.server.openocd.scripts.2=target/stm32c0x.cfg
+Nucleo_64.menu.pnum.NUCLEO_C031C6.openocd.target=stm32c0x
 Nucleo_64.menu.pnum.NUCLEO_C031C6.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32C0xx/STM32C031.svd
 
+# NUCLEO_C071RB board
+Nucleo_64.menu.pnum.NUCLEO_C071RB=Nucleo C071RB
+Nucleo_64.menu.pnum.NUCLEO_C071RB.node="NOD_C071RB"
+Nucleo_64.menu.pnum.NUCLEO_C071RB.upload.maximum_size=131072
+Nucleo_64.menu.pnum.NUCLEO_C071RB.upload.maximum_data_size=24576
+Nucleo_64.menu.pnum.NUCLEO_C071RB.build.mcu=cortex-m0plus
+Nucleo_64.menu.pnum.NUCLEO_C071RB.build.board=NUCLEO_C071RB
+Nucleo_64.menu.pnum.NUCLEO_C071RB.build.series=STM32C0xx
+Nucleo_64.menu.pnum.NUCLEO_C071RB.build.product_line=STM32C071xx
+Nucleo_64.menu.pnum.NUCLEO_C071RB.build.variant=STM32C0xx/C071R(8-B)T
+Nucleo_64.menu.pnum.NUCLEO_C071RB.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
+Nucleo_64.menu.pnum.NUCLEO_C071RB.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
+Nucleo_64.menu.pnum.NUCLEO_C071RB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32C0xx/STM32C071.svd
+
 # NUCLEO_F030R8 board
 Nucleo_64.menu.pnum.NUCLEO_F030R8=Nucleo F030R8
 Nucleo_64.menu.pnum.NUCLEO_F030R8.node="NODE_F030R8,NUCLEO"
@@ -436,7 +485,7 @@ Nucleo_64.menu.pnum.NUCLEO_F030R8.build.board=NUCLEO_F030R8
 Nucleo_64.menu.pnum.NUCLEO_F030R8.build.series=STM32F0xx
 Nucleo_64.menu.pnum.NUCLEO_F030R8.build.product_line=STM32F030x8
 Nucleo_64.menu.pnum.NUCLEO_F030R8.build.variant=STM32F0xx/F030R8T
-Nucleo_64.menu.pnum.NUCLEO_F030R8.debug.server.openocd.scripts.2=target/stm32f0x.cfg
+Nucleo_64.menu.pnum.NUCLEO_F030R8.openocd.target=stm32f0x
 Nucleo_64.menu.pnum.NUCLEO_F030R8.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x0.svd
 
 # NUCLEO_F070RB board
@@ -449,7 +498,7 @@ Nucleo_64.menu.pnum.NUCLEO_F070RB.build.board=NUCLEO_F070RB
 Nucleo_64.menu.pnum.NUCLEO_F070RB.build.series=STM32F0xx
 Nucleo_64.menu.pnum.NUCLEO_F070RB.build.product_line=STM32F070xB
 Nucleo_64.menu.pnum.NUCLEO_F070RB.build.variant=STM32F0xx/F070RBT
-Nucleo_64.menu.pnum.NUCLEO_F070RB.debug.server.openocd.scripts.2=target/stm32f0x.cfg
+Nucleo_64.menu.pnum.NUCLEO_F070RB.openocd.target=stm32f0x
 Nucleo_64.menu.pnum.NUCLEO_F070RB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x0.svd
 
 # NUCLEO_F072RB board
@@ -462,7 +511,7 @@ Nucleo_64.menu.pnum.NUCLEO_F072RB.build.board=NUCLEO_F072RB
 Nucleo_64.menu.pnum.NUCLEO_F072RB.build.series=STM32F0xx
 Nucleo_64.menu.pnum.NUCLEO_F072RB.build.product_line=STM32F072xB
 Nucleo_64.menu.pnum.NUCLEO_F072RB.build.variant=STM32F0xx/F072R8T_F072RB(H-I-T)
-Nucleo_64.menu.pnum.NUCLEO_F072RB.debug.server.openocd.scripts.2=target/stm32f0x.cfg
+Nucleo_64.menu.pnum.NUCLEO_F072RB.openocd.target=stm32f0x
 Nucleo_64.menu.pnum.NUCLEO_F072RB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
 
 # NUCLEO_F091RC board
@@ -475,7 +524,7 @@ Nucleo_64.menu.pnum.NUCLEO_F091RC.build.board=NUCLEO_F091RC
 Nucleo_64.menu.pnum.NUCLEO_F091RC.build.series=STM32F0xx
 Nucleo_64.menu.pnum.NUCLEO_F091RC.build.product_line=STM32F091xC
 Nucleo_64.menu.pnum.NUCLEO_F091RC.build.variant=STM32F0xx/F091RBT_F091RC(H-T-Y)
-Nucleo_64.menu.pnum.NUCLEO_F091RC.debug.server.openocd.scripts.2=target/stm32f0x.cfg
+Nucleo_64.menu.pnum.NUCLEO_F091RC.openocd.target=stm32f0x
 Nucleo_64.menu.pnum.NUCLEO_F091RC.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x1.svd
 
 # NUCLEO_F103RB board
@@ -488,7 +537,7 @@ Nucleo_64.menu.pnum.NUCLEO_F103RB.build.board=NUCLEO_F103RB
 Nucleo_64.menu.pnum.NUCLEO_F103RB.build.series=STM32F1xx
 Nucleo_64.menu.pnum.NUCLEO_F103RB.build.product_line=STM32F103xB
 Nucleo_64.menu.pnum.NUCLEO_F103RB.build.variant=STM32F1xx/F103R(8-B)T
-Nucleo_64.menu.pnum.NUCLEO_F103RB.debug.server.openocd.scripts.2=target/stm32f1x.cfg
+Nucleo_64.menu.pnum.NUCLEO_F103RB.openocd.target=stm32f1x
 Nucleo_64.menu.pnum.NUCLEO_F103RB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F103.svd
 
 # NUCLEO_F302R8 board
@@ -503,7 +552,7 @@ Nucleo_64.menu.pnum.NUCLEO_F302R8.build.board=NUCLEO_F302R8
 Nucleo_64.menu.pnum.NUCLEO_F302R8.build.series=STM32F3xx
 Nucleo_64.menu.pnum.NUCLEO_F302R8.build.product_line=STM32F302x8
 Nucleo_64.menu.pnum.NUCLEO_F302R8.build.variant=STM32F3xx/F302R(6-8)T
-Nucleo_64.menu.pnum.NUCLEO_F302R8.debug.server.openocd.scripts.2=target/stm32f3x.cfg
+Nucleo_64.menu.pnum.NUCLEO_F302R8.openocd.target=stm32f3x
 Nucleo_64.menu.pnum.NUCLEO_F302R8.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F3xx/STM32F302.svd
 
 # NUCLEO_F303RE board
@@ -518,7 +567,7 @@ Nucleo_64.menu.pnum.NUCLEO_F303RE.build.board=NUCLEO_F303RE
 Nucleo_64.menu.pnum.NUCLEO_F303RE.build.series=STM32F3xx
 Nucleo_64.menu.pnum.NUCLEO_F303RE.build.product_line=STM32F303xE
 Nucleo_64.menu.pnum.NUCLEO_F303RE.build.variant=STM32F3xx/F303R(D-E)T
-Nucleo_64.menu.pnum.NUCLEO_F303RE.debug.server.openocd.scripts.2=target/stm32f3x.cfg
+Nucleo_64.menu.pnum.NUCLEO_F303RE.openocd.target=stm32f3x
 Nucleo_64.menu.pnum.NUCLEO_F303RE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F3xx/STM32F303.svd
 
 # NUCLEO_F401RE board
@@ -533,7 +582,7 @@ Nucleo_64.menu.pnum.NUCLEO_F401RE.build.board=NUCLEO_F401RE
 Nucleo_64.menu.pnum.NUCLEO_F401RE.build.series=STM32F4xx
 Nucleo_64.menu.pnum.NUCLEO_F401RE.build.product_line=STM32F401xE
 Nucleo_64.menu.pnum.NUCLEO_F401RE.build.variant=STM32F4xx/F401R(B-C-D-E)T
-Nucleo_64.menu.pnum.NUCLEO_F401RE.debug.server.openocd.scripts.2=target/stm32f4x.cfg
+Nucleo_64.menu.pnum.NUCLEO_F401RE.openocd.target=stm32f4x
 Nucleo_64.menu.pnum.NUCLEO_F401RE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F401.svd
 
 # NUCLEO_F411RE board
@@ -548,7 +597,7 @@ Nucleo_64.menu.pnum.NUCLEO_F411RE.build.board=NUCLEO_F411RE
 Nucleo_64.menu.pnum.NUCLEO_F411RE.build.series=STM32F4xx
 Nucleo_64.menu.pnum.NUCLEO_F411RE.build.product_line=STM32F411xE
 Nucleo_64.menu.pnum.NUCLEO_F411RE.build.variant=STM32F4xx/F411R(C-E)T
-Nucleo_64.menu.pnum.NUCLEO_F411RE.debug.server.openocd.scripts.2=target/stm32f4x.cfg
+Nucleo_64.menu.pnum.NUCLEO_F411RE.openocd.target=stm32f4x
 Nucleo_64.menu.pnum.NUCLEO_F411RE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F411.svd
 
 # NUCLEO_F446RE board
@@ -563,7 +612,7 @@ Nucleo_64.menu.pnum.NUCLEO_F446RE.build.board=NUCLEO_F446RE
 Nucleo_64.menu.pnum.NUCLEO_F446RE.build.series=STM32F4xx
 Nucleo_64.menu.pnum.NUCLEO_F446RE.build.product_line=STM32F446xx
 Nucleo_64.menu.pnum.NUCLEO_F446RE.build.variant=STM32F4xx/F446R(C-E)T
-Nucleo_64.menu.pnum.NUCLEO_F446RE.debug.server.openocd.scripts.2=target/stm32f4x.cfg
+Nucleo_64.menu.pnum.NUCLEO_F446RE.openocd.target=stm32f4x
 Nucleo_64.menu.pnum.NUCLEO_F446RE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F446.svd
 
 # NUCLEO_G070RB board
@@ -577,7 +626,7 @@ Nucleo_64.menu.pnum.NUCLEO_G070RB.build.series=STM32G0xx
 Nucleo_64.menu.pnum.NUCLEO_G070RB.build.product_line=STM32G070xx
 Nucleo_64.menu.pnum.NUCLEO_G070RB.build.variant=STM32G0xx/G070RBT
 Nucleo_64.menu.pnum.NUCLEO_G070RB.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-Nucleo_64.menu.pnum.NUCLEO_G070RB.debug.server.openocd.scripts.2=target/stm32g0x.cfg
+Nucleo_64.menu.pnum.NUCLEO_G070RB.openocd.target=stm32g0x
 Nucleo_64.menu.pnum.NUCLEO_G070RB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G0xx/STM32G070.svd
 
 # NUCLEO_G071RB board
@@ -591,7 +640,7 @@ Nucleo_64.menu.pnum.NUCLEO_G071RB.build.series=STM32G0xx
 Nucleo_64.menu.pnum.NUCLEO_G071RB.build.product_line=STM32G071xx
 Nucleo_64.menu.pnum.NUCLEO_G071RB.build.variant=STM32G0xx/G071R(6-8)T_G071RB(I-T)_G081RB(I-T)
 Nucleo_64.menu.pnum.NUCLEO_G071RB.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-Nucleo_64.menu.pnum.NUCLEO_G071RB.debug.server.openocd.scripts.2=target/stm32g0x.cfg
+Nucleo_64.menu.pnum.NUCLEO_G071RB.openocd.target=stm32g0x
 Nucleo_64.menu.pnum.NUCLEO_G071RB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G0xx/STM32G071.svd
 
 # NUCLEO_G0B1RE board
@@ -605,7 +654,7 @@ Nucleo_64.menu.pnum.NUCLEO_G0B1RE.build.series=STM32G0xx
 Nucleo_64.menu.pnum.NUCLEO_G0B1RE.build.product_line=STM32G0B1xx
 Nucleo_64.menu.pnum.NUCLEO_G0B1RE.build.variant=STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T
 Nucleo_64.menu.pnum.NUCLEO_G0B1RE.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-Nucleo_64.menu.pnum.NUCLEO_G0B1RE.debug.server.openocd.scripts.2=target/stm32g0x.cfg
+Nucleo_64.menu.pnum.NUCLEO_G0B1RE.openocd.target=stm32g0x
 Nucleo_64.menu.pnum.NUCLEO_G0B1RE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G0xx/STM32G0B1.svd
 
 # NUCLEO_G431RB board
@@ -619,8 +668,8 @@ Nucleo_64.menu.pnum.NUCLEO_G431RB.build.float-abi=-mfloat-abi=hard
 Nucleo_64.menu.pnum.NUCLEO_G431RB.build.board=NUCLEO_G431RB
 Nucleo_64.menu.pnum.NUCLEO_G431RB.build.series=STM32G4xx
 Nucleo_64.menu.pnum.NUCLEO_G431RB.build.product_line=STM32G431xx
-Nucleo_64.menu.pnum.NUCLEO_G431RB.build.variant=STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)
-Nucleo_64.menu.pnum.NUCLEO_G431RB.debug.server.openocd.scripts.2=target/stm32g4x.cfg
+Nucleo_64.menu.pnum.NUCLEO_G431RB.build.variant=STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)
+Nucleo_64.menu.pnum.NUCLEO_G431RB.openocd.target=stm32g4x
 Nucleo_64.menu.pnum.NUCLEO_G431RB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G431.svd
 
 # NUCLEO_G474RE board
@@ -634,8 +683,8 @@ Nucleo_64.menu.pnum.NUCLEO_G474RE.build.float-abi=-mfloat-abi=hard
 Nucleo_64.menu.pnum.NUCLEO_G474RE.build.board=NUCLEO_G474RE
 Nucleo_64.menu.pnum.NUCLEO_G474RE.build.series=STM32G4xx
 Nucleo_64.menu.pnum.NUCLEO_G474RE.build.product_line=STM32G474xx
-Nucleo_64.menu.pnum.NUCLEO_G474RE.build.variant=STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET
-Nucleo_64.menu.pnum.NUCLEO_G474RE.debug.server.openocd.scripts.2=target/stm32g4x.cfg
+Nucleo_64.menu.pnum.NUCLEO_G474RE.build.variant=STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET
+Nucleo_64.menu.pnum.NUCLEO_G474RE.openocd.target=stm32g4x
 Nucleo_64.menu.pnum.NUCLEO_G474RE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
 
 # NUCLEO H503RB
@@ -650,7 +699,7 @@ Nucleo_64.menu.pnum.NUCLEO_H503RB.build.board=NUCLEO_H503RB
 Nucleo_64.menu.pnum.NUCLEO_H503RB.build.series=STM32H5xx
 Nucleo_64.menu.pnum.NUCLEO_H503RB.build.product_line=STM32H503xx
 Nucleo_64.menu.pnum.NUCLEO_H503RB.build.variant=STM32H5xx/H503RBT
-Nucleo_64.menu.pnum.NUCLEO_H503RB.debug.server.openocd.scripts.2=target/stm32h5x.cfg
+Nucleo_64.menu.pnum.NUCLEO_H503RB.openocd.target=stm32h5x
 Nucleo_64.menu.pnum.NUCLEO_H503RB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H5xx/STM32H503.svd
 
 # NUCLEO_L010RB board
@@ -664,7 +713,7 @@ Nucleo_64.menu.pnum.NUCLEO_L010RB.build.series=STM32L0xx
 Nucleo_64.menu.pnum.NUCLEO_L010RB.build.product_line=STM32L010xB
 Nucleo_64.menu.pnum.NUCLEO_L010RB.build.variant=STM32L0xx/L010RBT
 Nucleo_64.menu.pnum.NUCLEO_L010RB.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-Nucleo_64.menu.pnum.NUCLEO_L010RB.debug.server.openocd.scripts.2=target/stm32l0x.cfg
+Nucleo_64.menu.pnum.NUCLEO_L010RB.openocd.target=stm32l0
 Nucleo_64.menu.pnum.NUCLEO_L010RB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L0xx/STM32L0x0.svd
 
 # NUCLEO_L053R8 board
@@ -678,7 +727,7 @@ Nucleo_64.menu.pnum.NUCLEO_L053R8.build.series=STM32L0xx
 Nucleo_64.menu.pnum.NUCLEO_L053R8.build.product_line=STM32L053xx
 Nucleo_64.menu.pnum.NUCLEO_L053R8.build.variant=STM32L0xx/L052R(6-8)T_L053R(6-8)T_L063R8T
 Nucleo_64.menu.pnum.NUCLEO_L053R8.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-Nucleo_64.menu.pnum.NUCLEO_L053R8.debug.server.openocd.scripts.2=target/stm32l0x.cfg
+Nucleo_64.menu.pnum.NUCLEO_L053R8.openocd.target=stm32l0
 Nucleo_64.menu.pnum.NUCLEO_L053R8.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L0xx/STM32L053.svd
 
 # NUCLEO_L073RZ board
@@ -692,7 +741,7 @@ Nucleo_64.menu.pnum.NUCLEO_L073RZ.build.series=STM32L0xx
 Nucleo_64.menu.pnum.NUCLEO_L073RZ.build.product_line=STM32L073xx
 Nucleo_64.menu.pnum.NUCLEO_L073RZ.build.variant=STM32L0xx/L072R(B-Z)T_L073R(B-Z)T_L083R(B-Z)T
 Nucleo_64.menu.pnum.NUCLEO_L073RZ.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-Nucleo_64.menu.pnum.NUCLEO_L073RZ.debug.server.openocd.scripts.2=target/stm32l0x.cfg
+Nucleo_64.menu.pnum.NUCLEO_L073RZ.openocd.target=stm32l0
 Nucleo_64.menu.pnum.NUCLEO_L073RZ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L0xx/STM32L0x3.svd
 
 # NUCLEO_L152RE board
@@ -705,7 +754,7 @@ Nucleo_64.menu.pnum.NUCLEO_L152RE.build.board=NUCLEO_L152RE
 Nucleo_64.menu.pnum.NUCLEO_L152RE.build.series=STM32L1xx
 Nucleo_64.menu.pnum.NUCLEO_L152RE.build.product_line=STM32L152xE
 Nucleo_64.menu.pnum.NUCLEO_L152RE.build.variant=STM32L1xx/L151RET_L152RET_L162RET
-Nucleo_64.menu.pnum.NUCLEO_L152RE.debug.server.openocd.scripts.2=target/stm32l1x.cfg
+Nucleo_64.menu.pnum.NUCLEO_L152RE.openocd.target=stm32l1
 Nucleo_64.menu.pnum.NUCLEO_L152RE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L1xx/STM32L152.svd
 
 # NUCLEO_L433RC_P board
@@ -720,7 +769,7 @@ Nucleo_64.menu.pnum.NUCLEO_L433RC_P.build.board=NUCLEO_L433RC_P
 Nucleo_64.menu.pnum.NUCLEO_L433RC_P.build.series=STM32L4xx
 Nucleo_64.menu.pnum.NUCLEO_L433RC_P.build.product_line=STM32L433xx
 Nucleo_64.menu.pnum.NUCLEO_L433RC_P.build.variant=STM32L4xx/L433RCTxP
-Nucleo_64.menu.pnum.NUCLEO_L433RC_P.debug.server.openocd.scripts.2=target/stm32l4x.cfg
+Nucleo_64.menu.pnum.NUCLEO_L433RC_P.openocd.target=stm32l4x
 Nucleo_64.menu.pnum.NUCLEO_L433RC_P.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
 
 # NUCLEO_L452RE board
@@ -735,7 +784,7 @@ Nucleo_64.menu.pnum.NUCLEO_L452RE.build.board=NUCLEO_L452RE
 Nucleo_64.menu.pnum.NUCLEO_L452RE.build.series=STM32L4xx
 Nucleo_64.menu.pnum.NUCLEO_L452RE.build.product_line=STM32L452xx
 Nucleo_64.menu.pnum.NUCLEO_L452RE.build.variant=STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)
-Nucleo_64.menu.pnum.NUCLEO_L452RE.debug.server.openocd.scripts.2=target/stm32l4x.cfg
+Nucleo_64.menu.pnum.NUCLEO_L452RE.openocd.target=stm32l4x
 Nucleo_64.menu.pnum.NUCLEO_L452RE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
 
 # NUCLEO_L452RE-P board
@@ -750,7 +799,7 @@ Nucleo_64.menu.pnum.NUCLEO_L452REP.build.board=NUCLEO_L452RE_P
 Nucleo_64.menu.pnum.NUCLEO_L452REP.build.series=STM32L4xx
 Nucleo_64.menu.pnum.NUCLEO_L452REP.build.product_line=STM32L452xx
 Nucleo_64.menu.pnum.NUCLEO_L452REP.build.variant=STM32L4xx/L452RETxP
-Nucleo_64.menu.pnum.NUCLEO_L452REP.debug.server.openocd.scripts.2=target/stm32l4x.cfg
+Nucleo_64.menu.pnum.NUCLEO_L452REP.openocd.target=stm32l4x
 Nucleo_64.menu.pnum.NUCLEO_L452REP.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
 
 # NUCLEO_L476RG board
@@ -765,9 +814,23 @@ Nucleo_64.menu.pnum.NUCLEO_L476RG.build.board=NUCLEO_L476RG
 Nucleo_64.menu.pnum.NUCLEO_L476RG.build.series=STM32L4xx
 Nucleo_64.menu.pnum.NUCLEO_L476RG.build.product_line=STM32L476xx
 Nucleo_64.menu.pnum.NUCLEO_L476RG.build.variant=STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT
-Nucleo_64.menu.pnum.NUCLEO_L476RG.debug.server.openocd.scripts.2=target/stm32l4x.cfg
+Nucleo_64.menu.pnum.NUCLEO_L476RG.openocd.target=stm32l4x
 Nucleo_64.menu.pnum.NUCLEO_L476RG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L476.svd
 
+# NUCLEO_U083RC board
+Nucleo_64.menu.pnum.NUCLEO_U083RC=Nucleo U083RC
+Nucleo_64.menu.pnum.NUCLEO_U083RC.node=NOD_U083RC
+Nucleo_64.menu.pnum.NUCLEO_U083RC.upload.maximum_size=262144
+Nucleo_64.menu.pnum.NUCLEO_U083RC.upload.maximum_data_size=40960
+Nucleo_64.menu.pnum.NUCLEO_U083RC.build.mcu=cortex-m0plus
+Nucleo_64.menu.pnum.NUCLEO_U083RC.build.board=NUCLEO_U083RC
+Nucleo_64.menu.pnum.NUCLEO_U083RC.build.series=STM32U0xx
+Nucleo_64.menu.pnum.NUCLEO_U083RC.build.product_line=STM32U083xx
+Nucleo_64.menu.pnum.NUCLEO_U083RC.build.variant=STM32U0xx/U073R(8-B-C)(I-T)_U083RC(I-T)
+Nucleo_64.menu.pnum.NUCLEO_U083RC.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
+Nucleo_64.menu.pnum.NUCLEO_U083RC.openocd.target=stm32u0x
+Nucleo_64.menu.pnum.NUCLEO_U083RC.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U0xx/STM32U083.svd
+
 # NUCLEO_WB15CC
 Nucleo_64.menu.pnum.NUCLEO_WB15CC=Nucleo WB15CC
 Nucleo_64.menu.pnum.NUCLEO_WB15CC.node="NOD_WB15CC"
@@ -780,7 +843,7 @@ Nucleo_64.menu.pnum.NUCLEO_WB15CC.build.board=NUCLEO_WB15CC
 Nucleo_64.menu.pnum.NUCLEO_WB15CC.build.series=STM32WBxx
 Nucleo_64.menu.pnum.NUCLEO_WB15CC.build.product_line=STM32WB15xx
 Nucleo_64.menu.pnum.NUCLEO_WB15CC.build.variant=STM32WBxx/WB15CCU
-Nucleo_64.menu.pnum.NUCLEO_WB15CC.debug.server.openocd.scripts.2=target/stm32wbx.cfg
+Nucleo_64.menu.pnum.NUCLEO_WB15CC.openocd.target=stm32wbx
 Nucleo_64.menu.pnum.NUCLEO_WB15CC.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WBxx/STM32WB15_CM4.svd
 
 # P_NUCLEO_WB55RG board
@@ -795,7 +858,7 @@ Nucleo_64.menu.pnum.P_NUCLEO_WB55RG.build.board=P_NUCLEO_WB55RG
 Nucleo_64.menu.pnum.P_NUCLEO_WB55RG.build.series=STM32WBxx
 Nucleo_64.menu.pnum.P_NUCLEO_WB55RG.build.product_line=STM32WB55xx
 Nucleo_64.menu.pnum.P_NUCLEO_WB55RG.build.variant=STM32WBxx/WB55R(C-E-G)V
-Nucleo_64.menu.pnum.P_NUCLEO_WB55RG.debug.server.openocd.scripts.2=target/stm32wbx.cfg
+Nucleo_64.menu.pnum.P_NUCLEO_WB55RG.openocd.target=stm32wbx
 Nucleo_64.menu.pnum.P_NUCLEO_WB55RG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WBxx/STM32WB55_CM4.svd
 
 # P_NUCLEO_WB55 USB Dongle
@@ -810,7 +873,7 @@ Nucleo_64.menu.pnum.P_NUCLEO_WB55_USB_DONGLE.build.board=P_NUCLEO_WB55_USB_DONGL
 Nucleo_64.menu.pnum.P_NUCLEO_WB55_USB_DONGLE.build.series=STM32WBxx
 Nucleo_64.menu.pnum.P_NUCLEO_WB55_USB_DONGLE.build.product_line=STM32WB55xx
 Nucleo_64.menu.pnum.P_NUCLEO_WB55_USB_DONGLE.build.variant=STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U
-Nucleo_64.menu.pnum.P_NUCLEO_WB55_USB_DONGLE.debug.server.openocd.scripts.2=target/stm32wbx.cfg
+Nucleo_64.menu.pnum.P_NUCLEO_WB55_USB_DONGLE.openocd.target=stm32wbx
 Nucleo_64.menu.pnum.P_NUCLEO_WB55_USB_DONGLE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WBxx/STM32WB55_CM4.svd
 
 # NUCLEO WBA55CG
@@ -825,7 +888,7 @@ Nucleo_64.menu.pnum.NUCLEO_WBA55CG.build.board=NUCLEO_WBA55CG
 Nucleo_64.menu.pnum.NUCLEO_WBA55CG.build.series=STM32WBAxx
 Nucleo_64.menu.pnum.NUCLEO_WBA55CG.build.product_line=STM32WBA55xx
 Nucleo_64.menu.pnum.NUCLEO_WBA55CG.build.variant=STM32WBAxx/WBA55C(E-G)U
-Nucleo_64.menu.pnum.NUCLEO_WBA55CG.debug.server.openocd.scripts.2=target/stm32wbax.cfg
+Nucleo_64.menu.pnum.NUCLEO_WBA55CG.openocd.target=stm32wbax
 Nucleo_64.menu.pnum.NUCLEO_WBA55CG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WBAxx/STM32WBA55.svd
 
 # NUCLEO_WL55JC1 board
@@ -839,7 +902,7 @@ Nucleo_64.menu.pnum.NUCLEO_WL55JC1.build.series=STM32WLxx
 Nucleo_64.menu.pnum.NUCLEO_WL55JC1.build.product_line=STM32WLE5xx
 Nucleo_64.menu.pnum.NUCLEO_WL55JC1.build.variant=STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I
 Nucleo_64.menu.pnum.NUCLEO_WL55JC1.build.st_extra_flags=-D{build.product_line} -DUSE_CM4_STARTUP_FILE {build.xSerial}
-Nucleo_64.menu.pnum.NUCLEO_WL55JC1.debug.server.openocd.scripts.2=target/stm32wlx.cfg
+Nucleo_64.menu.pnum.NUCLEO_WL55JC1.openocd.target=stm32wlx
 Nucleo_64.menu.pnum.NUCLEO_WL55JC1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WLxx/STM32WLE5_CM4.svd
 
 # Upload menu
@@ -852,6 +915,11 @@ Nucleo_64.menu.upload_method.swdMethod.upload.protocol=swd
 Nucleo_64.menu.upload_method.swdMethod.upload.options=
 Nucleo_64.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+Nucleo_64.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+Nucleo_64.menu.upload_method.jlinkMethod.upload.protocol=jlink
+Nucleo_64.menu.upload_method.jlinkMethod.upload.options=
+Nucleo_64.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 Nucleo_64.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 Nucleo_64.menu.upload_method.serialMethod.upload.protocol=serial
 Nucleo_64.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -862,6 +930,18 @@ Nucleo_64.menu.upload_method.dfuMethod.upload.protocol=dfu
 Nucleo_64.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 Nucleo_64.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+Nucleo_64.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+Nucleo_64.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+Nucleo_64.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+Nucleo_64.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+Nucleo_64.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+Nucleo_64.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+Nucleo_64.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+Nucleo_64.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+Nucleo_64.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # Nucleo 32 boards
 
@@ -902,7 +982,7 @@ Nucleo_32.menu.pnum.NUCLEO_F031K6.build.board=NUCLEO_F031K6
 Nucleo_32.menu.pnum.NUCLEO_F031K6.build.series=STM32F0xx
 Nucleo_32.menu.pnum.NUCLEO_F031K6.build.product_line=STM32F031x6
 Nucleo_32.menu.pnum.NUCLEO_F031K6.build.variant=STM32F0xx/F031K6T
-Nucleo_32.menu.pnum.NUCLEO_F031K6.debug.server.openocd.scripts.2=target/stm32f0x.cfg
+Nucleo_32.menu.pnum.NUCLEO_F031K6.openocd.target=stm32f0x
 Nucleo_32.menu.pnum.NUCLEO_F031K6.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x1.svd
 
 # NUCLEO_F042K6 board
@@ -915,7 +995,7 @@ Nucleo_32.menu.pnum.NUCLEO_F042K6.build.board=NUCLEO_F042K6
 Nucleo_32.menu.pnum.NUCLEO_F042K6.build.series=STM32F0xx
 Nucleo_32.menu.pnum.NUCLEO_F042K6.build.product_line=STM32F042x6
 Nucleo_32.menu.pnum.NUCLEO_F042K6.build.variant=STM32F0xx/F042K(4-6)T
-Nucleo_32.menu.pnum.NUCLEO_F042K6.debug.server.openocd.scripts.2=target/stm32f0x.cfg
+Nucleo_32.menu.pnum.NUCLEO_F042K6.openocd.target=stm32f0x
 Nucleo_32.menu.pnum.NUCLEO_F042K6.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
 
 # NUCLEO_F303K8 board
@@ -930,7 +1010,7 @@ Nucleo_32.menu.pnum.NUCLEO_F303K8.build.board=NUCLEO_F303K8
 Nucleo_32.menu.pnum.NUCLEO_F303K8.build.series=STM32F3xx
 Nucleo_32.menu.pnum.NUCLEO_F303K8.build.product_line=STM32F303x8
 Nucleo_32.menu.pnum.NUCLEO_F303K8.build.variant=STM32F3xx/F303K(6-8)T_F334K(4-6-8)T
-Nucleo_32.menu.pnum.NUCLEO_F303K8.debug.server.openocd.scripts.2=target/stm32f3x.cfg
+Nucleo_32.menu.pnum.NUCLEO_F303K8.openocd.target=stm32f3x
 Nucleo_32.menu.pnum.NUCLEO_F303K8.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F3xx/STM32F303.svd
 
 # NUCLEO_G031K8 board
@@ -944,7 +1024,7 @@ Nucleo_32.menu.pnum.NUCLEO_G031K8.build.series=STM32G0xx
 Nucleo_32.menu.pnum.NUCLEO_G031K8.build.product_line=STM32G031xx
 Nucleo_32.menu.pnum.NUCLEO_G031K8.build.variant=STM32G0xx/G031K(4-6-8)(T-U)_G041K(6-8)(T-U)
 Nucleo_32.menu.pnum.NUCLEO_G031K8.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-Nucleo_32.menu.pnum.NUCLEO_G031K8.debug.server.openocd.scripts.2=target/stm32g0x.cfg
+Nucleo_32.menu.pnum.NUCLEO_G031K8.openocd.target=stm32g0x
 Nucleo_32.menu.pnum.NUCLEO_G031K8.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G0xx/STM32G031.svd
 
 # NUCLEO_G431KB board
@@ -959,7 +1039,7 @@ Nucleo_32.menu.pnum.NUCLEO_G431KB.build.board=NUCLEO_G431KB
 Nucleo_32.menu.pnum.NUCLEO_G431KB.build.series=STM32G4xx
 Nucleo_32.menu.pnum.NUCLEO_G431KB.build.product_line=STM32G431xx
 Nucleo_32.menu.pnum.NUCLEO_G431KB.build.variant=STM32G4xx/G431K(6-8-B)(T-U)_G441KB(T-U)
-Nucleo_32.menu.pnum.NUCLEO_G431KB.debug.server.openocd.scripts.2=target/stm32g4x.cfg
+Nucleo_32.menu.pnum.NUCLEO_G431KB.openocd.target=stm32g4x
 Nucleo_32.menu.pnum.NUCLEO_G431KB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G431.svd
 
 # NUCLEO_L031K6 board
@@ -972,7 +1052,7 @@ Nucleo_32.menu.pnum.NUCLEO_L031K6.build.board=NUCLEO_L031K6
 Nucleo_32.menu.pnum.NUCLEO_L031K6.build.series=STM32L0xx
 Nucleo_32.menu.pnum.NUCLEO_L031K6.build.product_line=STM32L031xx
 Nucleo_32.menu.pnum.NUCLEO_L031K6.build.variant=STM32L0xx/L031K(4-6)T_L041K6T
-Nucleo_32.menu.pnum.NUCLEO_L031K6.debug.server.openocd.scripts.2=target/stm32l0x.cfg
+Nucleo_32.menu.pnum.NUCLEO_L031K6.openocd.target=stm32l0
 Nucleo_32.menu.pnum.NUCLEO_L031K6.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L0xx/STM32L0x1.svd
 
 # NUCLEO_L412KB board
@@ -987,7 +1067,7 @@ Nucleo_32.menu.pnum.NUCLEO_L412KB.build.board=NUCLEO_L412KB
 Nucleo_32.menu.pnum.NUCLEO_L412KB.build.series=STM32L4xx
 Nucleo_32.menu.pnum.NUCLEO_L412KB.build.product_line=STM32L412xx
 Nucleo_32.menu.pnum.NUCLEO_L412KB.build.variant=STM32L4xx/L412K(8-B)(T-U)_L422KB(T-U)
-Nucleo_32.menu.pnum.NUCLEO_L412KB.debug.server.openocd.scripts.2=target/stm32l4x.cfg
+Nucleo_32.menu.pnum.NUCLEO_L412KB.openocd.target=stm32l4x
 Nucleo_32.menu.pnum.NUCLEO_L412KB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L412.svd
 
 # NUCLEO_L432KC board
@@ -1002,7 +1082,7 @@ Nucleo_32.menu.pnum.NUCLEO_L432KC.build.board=NUCLEO_L432KC
 Nucleo_32.menu.pnum.NUCLEO_L432KC.build.series=STM32L4xx
 Nucleo_32.menu.pnum.NUCLEO_L432KC.build.product_line=STM32L432xx
 Nucleo_32.menu.pnum.NUCLEO_L432KC.build.variant=STM32L4xx/L432K(B-C)U_L442KCU
-Nucleo_32.menu.pnum.NUCLEO_L432KC.debug.server.openocd.scripts.2=target/stm32l4x.cfg
+Nucleo_32.menu.pnum.NUCLEO_L432KC.openocd.target=stm32l4x
 Nucleo_32.menu.pnum.NUCLEO_L432KC.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x2.svd
 
 # Upload menu
@@ -1015,6 +1095,11 @@ Nucleo_32.menu.upload_method.swdMethod.upload.protocol=swd
 Nucleo_32.menu.upload_method.swdMethod.upload.options=
 Nucleo_32.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+Nucleo_32.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+Nucleo_32.menu.upload_method.jlinkMethod.upload.protocol=jlink
+Nucleo_32.menu.upload_method.jlinkMethod.upload.options=
+Nucleo_32.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 Nucleo_32.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 Nucleo_32.menu.upload_method.serialMethod.upload.protocol=serial
 Nucleo_32.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -1025,6 +1110,18 @@ Nucleo_32.menu.upload_method.dfuMethod.upload.protocol=dfu
 Nucleo_32.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 Nucleo_32.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+Nucleo_32.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+Nucleo_32.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+Nucleo_32.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+Nucleo_32.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+Nucleo_32.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+Nucleo_32.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+Nucleo_32.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+Nucleo_32.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+Nucleo_32.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # Discovery boards
 
@@ -1068,7 +1165,7 @@ Disco.menu.pnum.B_G431B_ESC1.build.series=STM32G4xx
 Disco.menu.pnum.B_G431B_ESC1.build.product_line=STM32G431xx
 Disco.menu.pnum.B_G431B_ESC1.build.variant=STM32G4xx/G431C(6-8-B)U_G441CBU
 Disco.menu.pnum.B_G431B_ESC1.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Disco.menu.pnum.B_G431B_ESC1.debug.server.openocd.scripts.2=target/stm32g4x.cfg
+Disco.menu.pnum.B_G431B_ESC1.openocd.target=stm32g4x
 Disco.menu.pnum.B_G431B_ESC1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G431.svd
 
 # B-L072Z-LRWAN1 board
@@ -1083,7 +1180,7 @@ Disco.menu.pnum.B_L072Z_LRWAN1.build.product_line=STM32L072xx
 Disco.menu.pnum.B_L072Z_LRWAN1.build.variant=STM32L0xx/L072CBY_L072CZ(E-Y)_L073CZY_L082CZY
 Disco.menu.pnum.B_L072Z_LRWAN1.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 Disco.menu.pnum.B_L072Z_LRWAN1.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-Disco.menu.pnum.B_L072Z_LRWAN1.debug.server.openocd.scripts.2=target/stm32l0x.cfg
+Disco.menu.pnum.B_L072Z_LRWAN1.openocd.target=stm32l0
 Disco.menu.pnum.B_L072Z_LRWAN1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L0xx/STM32L0x2.svd
 
 # B-L475E-IOT01A board
@@ -1099,7 +1196,7 @@ Disco.menu.pnum.B_L475E_IOT01A.build.series=STM32L4xx
 Disco.menu.pnum.B_L475E_IOT01A.build.product_line=STM32L475xx
 Disco.menu.pnum.B_L475E_IOT01A.build.variant=STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT
 Disco.menu.pnum.B_L475E_IOT01A.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Disco.menu.pnum.B_L475E_IOT01A.debug.server.openocd.scripts.2=target/stm32l4x.cfg
+Disco.menu.pnum.B_L475E_IOT01A.openocd.target=stm32l4x
 Disco.menu.pnum.B_L475E_IOT01A.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x5.svd
 
 # B_L4S5I_IOT01A board
@@ -1115,7 +1212,7 @@ Disco.menu.pnum.B_L4S5I_IOT01A.build.series=STM32L4xx
 Disco.menu.pnum.B_L4S5I_IOT01A.build.product_line=STM32L4S5xx
 Disco.menu.pnum.B_L4S5I_IOT01A.build.variant=STM32L4xx/L4R5V(G-I)T_L4R7VIT_L4S5VIT_L4S7VIT
 Disco.menu.pnum.B_L4S5I_IOT01A.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Disco.menu.pnum.B_L4S5I_IOT01A.debug.server.openocd.scripts.2=target/stm32l4x.cfg
+Disco.menu.pnum.B_L4S5I_IOT01A.openocd.target=stm32l4x
 Disco.menu.pnum.B_L4S5I_IOT01A.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4S5.svd
 
 # B_U585I_IOT02A board
@@ -1131,7 +1228,7 @@ Disco.menu.pnum.B_U585I_IOT02A.build.series=STM32U5xx
 Disco.menu.pnum.B_U585I_IOT02A.build.product_line=STM32U585xx
 Disco.menu.pnum.B_U585I_IOT02A.build.variant=STM32U5xx/U575A(G-I)IxQ_U585AIIxQ
 Disco.menu.pnum.B_U585I_IOT02A.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Disco.menu.pnum.B_U585I_IOT02A.debug.server.openocd.scripts.2=target/stm32u5x.cfg
+Disco.menu.pnum.B_U585I_IOT02A.openocd.target=stm32u5x
 Disco.menu.pnum.B_U585I_IOT02A.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U5xx/STM32U585.svd
 
 # STM32C0316-DK board
@@ -1145,7 +1242,7 @@ Disco.menu.pnum.STM32C0116_DK.build.series=STM32C0xx
 Disco.menu.pnum.STM32C0116_DK.build.product_line=STM32C011xx
 Disco.menu.pnum.STM32C0116_DK.build.variant=STM32C0xx/C011D6Y_C011F(4-6)(P-U)_C031F(4-6)P
 Disco.menu.pnum.STM32C0116_DK.build.st_extra_flags=-D{build.product_line} {build.xSerial} -D__CORTEX_SC=0
-Disco.menu.pnum.STM32C0116_DK.debug.server.openocd.scripts.2=target/stm32c0x.cfg
+Disco.menu.pnum.STM32C0116_DK.openocd.target=stm32c0x
 Disco.menu.pnum.STM32C0116_DK.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32C0xx/STM32C011.svd
 
 # STM32C0316-DK board
@@ -1159,7 +1256,7 @@ Disco.menu.pnum.STM32C0316_DK.build.series=STM32C0xx
 Disco.menu.pnum.STM32C0316_DK.build.product_line=STM32C031xx
 Disco.menu.pnum.STM32C0316_DK.build.variant=STM32C0xx/C031C(4-6)(T-U)
 Disco.menu.pnum.STM32C0316_DK.build.st_extra_flags=-D{build.product_line} {build.xSerial} -D__CORTEX_SC=0
-Disco.menu.pnum.STM32C0316_DK.debug.server.openocd.scripts.2=target/stm32c0x.cfg
+Disco.menu.pnum.STM32C0316_DK.openocd.target=stm32c0x
 Disco.menu.pnum.STM32C0316_DK.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32C0xx/STM32C031.svd
 
 # DISCO_F030R8 board
@@ -1172,7 +1269,7 @@ Disco.menu.pnum.DISCO_F030R8.build.board=DISCO_F030R8
 Disco.menu.pnum.DISCO_F030R8.build.series=STM32F0xx
 Disco.menu.pnum.DISCO_F030R8.build.product_line=STM32F030x8
 Disco.menu.pnum.DISCO_F030R8.build.variant=STM32F0xx/F030R8T
-Disco.menu.pnum.DISCO_F030R8.debug.server.openocd.scripts.2=target/stm32f0x.cfg
+Disco.menu.pnum.DISCO_F030R8.openocd.target=stm32f0x
 Disco.menu.pnum.DISCO_F030R8.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x0.svd
 
 # DISCO_F072RB board
@@ -1185,7 +1282,7 @@ Disco.menu.pnum.DISCO_F072RB.build.board=DISCO_F072RB
 Disco.menu.pnum.DISCO_F072RB.build.series=STM32F0xx
 Disco.menu.pnum.DISCO_F072RB.build.product_line=STM32F072xB
 Disco.menu.pnum.DISCO_F072RB.build.variant=STM32F0xx/F072R8T_F072RB(H-I-T)
-Disco.menu.pnum.DISCO_F072RB.debug.server.openocd.scripts.2=target/stm32f0x.cfg
+Disco.menu.pnum.DISCO_F072RB.openocd.target=stm32f0x
 Disco.menu.pnum.DISCO_F072RB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
 
 # DISCO_F100RB board
@@ -1198,7 +1295,7 @@ Disco.menu.pnum.DISCO_F100RB.build.board=DISCO_F100RB
 Disco.menu.pnum.DISCO_F100RB.build.series=STM32F1xx
 Disco.menu.pnum.DISCO_F100RB.build.product_line=STM32F100xB
 Disco.menu.pnum.DISCO_F100RB.build.variant=STM32F1xx/F100R(8-B)T
-Disco.menu.pnum.DISCO_F100RB.debug.server.openocd.scripts.2=target/stm32f1x.cfg
+Disco.menu.pnum.DISCO_F100RB.openocd.target=stm32f1x
 Disco.menu.pnum.DISCO_F100RB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F100.svd
 
 # DISCO_F303VC board
@@ -1213,7 +1310,7 @@ Disco.menu.pnum.DISCO_F303VC.build.board=DISCO_F303VC
 Disco.menu.pnum.DISCO_F303VC.build.series=STM32F3xx
 Disco.menu.pnum.DISCO_F303VC.build.product_line=STM32F303xC
 Disco.menu.pnum.DISCO_F303VC.build.variant=STM32F3xx/F303V(B-C)T
-Disco.menu.pnum.DISCO_F303VC.debug.server.openocd.scripts.2=target/stm32f3x.cfg
+Disco.menu.pnum.DISCO_F303VC.openocd.target=stm32f3x
 Disco.menu.pnum.DISCO_F303VC.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F3xx/STM32F303.svd
 
 # DISCO_F407VG board
@@ -1228,7 +1325,7 @@ Disco.menu.pnum.DISCO_F407VG.build.board=DISCO_F407VG
 Disco.menu.pnum.DISCO_F407VG.build.series=STM32F4xx
 Disco.menu.pnum.DISCO_F407VG.build.product_line=STM32F407xx
 Disco.menu.pnum.DISCO_F407VG.build.variant=STM32F4xx/F407V(E-G)T_F417V(E-G)T
-Disco.menu.pnum.DISCO_F407VG.debug.server.openocd.scripts.2=target/stm32f4x.cfg
+Disco.menu.pnum.DISCO_F407VG.openocd.target=stm32f4x
 Disco.menu.pnum.DISCO_F407VG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F407.svd
 
 # DISCO_F413ZH board
@@ -1244,7 +1341,7 @@ Disco.menu.pnum.DISCO_F413ZH.build.series=STM32F4xx
 Disco.menu.pnum.DISCO_F413ZH.build.product_line=STM32F413xx
 Disco.menu.pnum.DISCO_F413ZH.build.variant=STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)
 Disco.menu.pnum.DISCO_F413ZH.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Disco.menu.pnum.DISCO_F413ZH.debug.server.openocd.scripts.2=target/stm32f4x.cfg
+Disco.menu.pnum.DISCO_F413ZH.openocd.target=stm32f4x
 Disco.menu.pnum.DISCO_F413ZH.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F413.svd
 
 # DISCO_F746NG board
@@ -1260,7 +1357,7 @@ Disco.menu.pnum.DISCO_F746NG.build.series=STM32F7xx
 Disco.menu.pnum.DISCO_F746NG.build.product_line=STM32F746xx
 Disco.menu.pnum.DISCO_F746NG.build.variant=STM32F7xx/F746B(E-G)T_F746N(E-G)H_F750N8H_F756BGT_F756NGH
 Disco.menu.pnum.DISCO_F746NG.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Disco.menu.pnum.DISCO_F746NG.debug.server.openocd.scripts.2=target/stm32f7x.cfg
+Disco.menu.pnum.DISCO_F746NG.openocd.target=stm32f7x
 Disco.menu.pnum.DISCO_F746NG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F7xx/STM32F746.svd
 
 # DISCO_G0316 board
@@ -1274,7 +1371,7 @@ Disco.menu.pnum.DISCO_G0316.build.series=STM32G0xx
 Disco.menu.pnum.DISCO_G0316.build.product_line=STM32G031xx
 Disco.menu.pnum.DISCO_G0316.build.variant=STM32G0xx/G031J(4-6)M_G041J6M
 Disco.menu.pnum.DISCO_G0316.build.st_extra_flags=-D{build.product_line} {build.xSerial} -D__CORTEX_SC=0
-Disco.menu.pnum.DISCO_G0316.debug.server.openocd.scripts.2=target/stm32g0x.cfg
+Disco.menu.pnum.DISCO_G0316.openocd.target=stm32g0x
 Disco.menu.pnum.DISCO_G0316.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G0xx/STM32G031.svd
 
 # STM32H573I-DK
@@ -1290,7 +1387,7 @@ Disco.menu.pnum.STM32H573I_DK.build.series=STM32H5xx
 Disco.menu.pnum.STM32H573I_DK.build.product_line=STM32H573xx
 Disco.menu.pnum.STM32H573I_DK.build.variant=STM32H5xx/H563IIKxQ_H573IIKxQ
 Disco.menu.pnum.STM32H573I_DK.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Disco.menu.pnum.STM32H573I_DK.debug.server.openocd.scripts.2=target/stm32h5x.cfg
+Disco.menu.pnum.STM32H573I_DK.openocd.target=stm32h5x
 Disco.menu.pnum.STM32H573I_DK.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H5xx/STM32H573.svd
 
 # STM32H747I-DISCO
@@ -1307,7 +1404,7 @@ Disco.menu.pnum.STM32H747I_DISCO.build.product_line=STM32H747xx
 Disco.menu.pnum.STM32H747I_DISCO.build.variant=STM32H7xx/H742X(G-I)H_H743X(G-I)H_H745X(G-I)H_H747X(G-I)H_H750XBH_H753XIH_H755XIH_H757XIH
 Disco.menu.pnum.STM32H747I_DISCO.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -DCORE_CM7
 Disco.menu.pnum.STM32H747I_DISCO.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Disco.menu.pnum.STM32H747I_DISCO.debug.server.openocd.scripts.2=target/stm32h7x.cfg
+Disco.menu.pnum.STM32H747I_DISCO.openocd.target=stm32h7x
 Disco.menu.pnum.STM32H747I_DISCO.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H747_CM7.svd
 
 # STM32WB5MM-DK board
@@ -1323,7 +1420,7 @@ Disco.menu.pnum.STM32WB5MM_DK.build.series=STM32WBxx
 Disco.menu.pnum.STM32WB5MM_DK.build.product_line=STM32WB5Mxx
 Disco.menu.pnum.STM32WB5MM_DK.build.variant=STM32WBxx/WB5MMGH
 Disco.menu.pnum.STM32WB5MM_DK.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Disco.menu.pnum.STM32WB5MM_DK.debug.server.openocd.scripts.2=target/stm32wbx.cfg
+Disco.menu.pnum.STM32WB5MM_DK.openocd.target=stm32wbx
 Disco.menu.pnum.STM32WB5MM_DK.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WBxx/STM32WB55_CM4.svd
 
 # Upload menu
@@ -1336,6 +1433,11 @@ Disco.menu.upload_method.swdMethod.upload.protocol=swd
 Disco.menu.upload_method.swdMethod.upload.options=
 Disco.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+Disco.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+Disco.menu.upload_method.jlinkMethod.upload.protocol=jlink
+Disco.menu.upload_method.jlinkMethod.upload.options=
+Disco.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 Disco.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 Disco.menu.upload_method.serialMethod.upload.protocol=serial
 Disco.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -1346,6 +1448,18 @@ Disco.menu.upload_method.dfuMethod.upload.protocol=dfu
 Disco.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 Disco.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+Disco.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+Disco.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+Disco.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+Disco.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+Disco.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+Disco.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+Disco.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+Disco.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+Disco.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # Eval boards
 
@@ -1388,7 +1502,7 @@ Eval.menu.pnum.STEVAL_MKSBOX1V1.build.series=STM32L4xx
 Eval.menu.pnum.STEVAL_MKSBOX1V1.build.product_line=STM32L4R9xx
 Eval.menu.pnum.STEVAL_MKSBOX1V1.build.variant=STM32L4xx/L4R9Z(G-I)J_L4S9ZIJ
 Eval.menu.pnum.STEVAL_MKSBOX1V1.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Eval.menu.pnum.STEVAL_MKSBOX1V1.debug.server.openocd.scripts.2=target/stm32l4x.cfg
+Eval.menu.pnum.STEVAL_MKSBOX1V1.openocd.target=stm32l4x
 Eval.menu.pnum.STEVAL_MKSBOX1V1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4R9.svd
 
 # STEVAL_MKBOXPRO board
@@ -1403,7 +1517,7 @@ Eval.menu.pnum.STEVAL_MKBOXPRO.build.series=STM32U5xx
 Eval.menu.pnum.STEVAL_MKBOXPRO.build.product_line=STM32U585xx
 Eval.menu.pnum.STEVAL_MKBOXPRO.build.variant=STM32U5xx/U575A(G-I)IxQ_U585AIIxQ
 Eval.menu.pnum.STEVAL_MKBOXPRO.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Eval.menu.pnum.STEVAL_MKBOXPRO.debug.server.openocd.scripts.2=target/stm32u5x.cfg
+Eval.menu.pnum.STEVAL_MKBOXPRO.openocd.target=stm32u5x
 Eval.menu.pnum.STEVAL_MKBOXPRO.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U5xx/STM32U585.svd
 
 # Upload menu
@@ -1412,11 +1526,28 @@ Eval.menu.upload_method.swdMethod.upload.protocol=swd
 Eval.menu.upload_method.swdMethod.upload.options=
 Eval.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+Eval.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+Eval.menu.upload_method.jlinkMethod.upload.protocol=jlink
+Eval.menu.upload_method.jlinkMethod.upload.options=
+Eval.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 Eval.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
 Eval.menu.upload_method.dfuMethod.upload.protocol=dfu
 Eval.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 Eval.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+Eval.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+Eval.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+Eval.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+Eval.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+Eval.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+Eval.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+Eval.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+Eval.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+Eval.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # STM32MP1 microprocessor series (MPU + MCU)
 
@@ -1470,7 +1601,7 @@ GenC0.build.st_extra_flags=-D{build.product_line} {build.xSerial} -D__CORTEX_SC=
 GenC0.build.flash_offset=0x0
 GenC0.upload.maximum_size=0
 GenC0.upload.maximum_data_size=0
-GenC0.debug.server.openocd.scripts.2=target/stm32c0x.cfg
+GenC0.openocd.target=stm32c0x
 
 # Generic C011D6Yx
 GenC0.menu.pnum.GENERIC_C011D6YX=Generic C011D6Yx
@@ -1589,17 +1720,52 @@ GenC0.menu.pnum.GENERIC_C031F6PX.build.product_line=STM32C031xx
 GenC0.menu.pnum.GENERIC_C031F6PX.build.variant=STM32C0xx/C011D6Y_C011F(4-6)(P-U)_C031F(4-6)P
 GenC0.menu.pnum.GENERIC_C031F6PX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32C0xx/STM32C031.svd
 
+# Generic C071R8Tx
+GenC0.menu.pnum.GENERIC_C071R8TX=Generic C071R8Tx
+GenC0.menu.pnum.GENERIC_C071R8TX.upload.maximum_size=65536
+GenC0.menu.pnum.GENERIC_C071R8TX.upload.maximum_data_size=24576
+GenC0.menu.pnum.GENERIC_C071R8TX.build.board=GENERIC_C071R8TX
+GenC0.menu.pnum.GENERIC_C071R8TX.build.product_line=STM32C071xx
+GenC0.menu.pnum.GENERIC_C071R8TX.build.variant=STM32C0xx/C071R(8-B)T
+GenC0.menu.pnum.GENERIC_C071R8TX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32C0xx/STM32C071.svd
+
+# Generic C071RBTx
+GenC0.menu.pnum.GENERIC_C071RBTX=Generic C071RBTx
+GenC0.menu.pnum.GENERIC_C071RBTX.upload.maximum_size=131072
+GenC0.menu.pnum.GENERIC_C071RBTX.upload.maximum_data_size=24576
+GenC0.menu.pnum.GENERIC_C071RBTX.build.board=GENERIC_C071RBTX
+GenC0.menu.pnum.GENERIC_C071RBTX.build.product_line=STM32C071xx
+GenC0.menu.pnum.GENERIC_C071RBTX.build.variant=STM32C0xx/C071R(8-B)T
+GenC0.menu.pnum.GENERIC_C071RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32C0xx/STM32C071.svd
+
 # Upload menu
 GenC0.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
 GenC0.menu.upload_method.swdMethod.upload.protocol=swd
 GenC0.menu.upload_method.swdMethod.upload.options=
 GenC0.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+GenC0.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+GenC0.menu.upload_method.jlinkMethod.upload.protocol=jlink
+GenC0.menu.upload_method.jlinkMethod.upload.options=
+GenC0.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 GenC0.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenC0.menu.upload_method.serialMethod.upload.protocol=serial
 GenC0.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 GenC0.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
+GenC0.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+GenC0.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+GenC0.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+GenC0.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+GenC0.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+GenC0.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+GenC0.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+GenC0.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+GenC0.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ###############################
 # Generic F0
 GenF0.name=Generic STM32F0 series
@@ -1612,7 +1778,7 @@ GenF0.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSer
 GenF0.build.flash_offset=0x0
 GenF0.upload.maximum_size=0
 GenF0.upload.maximum_data_size=0
-GenF0.debug.server.openocd.scripts.2=target/stm32f0x.cfg
+GenF0.openocd.target=stm32f0x
 GenF0.vid.0=0x0483
 GenF0.pid.0=0x5740
 
@@ -1907,15 +2073,6 @@ GenF0.menu.pnum.GENERIC_F042K4TX.build.product_line=STM32F042x6
 GenF0.menu.pnum.GENERIC_F042K4TX.build.variant=STM32F0xx/F042K(4-6)T
 GenF0.menu.pnum.GENERIC_F042K4TX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
 
-# Generic F042K6Tx
-GenF0.menu.pnum.GENERIC_F042K6TX=Generic F042K6Tx
-GenF0.menu.pnum.GENERIC_F042K6TX.upload.maximum_size=32768
-GenF0.menu.pnum.GENERIC_F042K6TX.upload.maximum_data_size=6144
-GenF0.menu.pnum.GENERIC_F042K6TX.build.board=GENERIC_F042K6TX
-GenF0.menu.pnum.GENERIC_F042K6TX.build.product_line=STM32F042x6
-GenF0.menu.pnum.GENERIC_F042K6TX.build.variant=STM32F0xx/F042K(4-6)T
-GenF0.menu.pnum.GENERIC_F042K6TX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
-
 # Generic F042K6Ux
 GenF0.menu.pnum.GENERIC_F042K6UX=Generic F042K6Ux
 GenF0.menu.pnum.GENERIC_F042K6UX.upload.maximum_size=32768
@@ -1925,6 +2082,15 @@ GenF0.menu.pnum.GENERIC_F042K6UX.build.product_line=STM32F042x6
 GenF0.menu.pnum.GENERIC_F042K6UX.build.variant=STM32F0xx/F042K(4-6)U
 GenF0.menu.pnum.GENERIC_F042K6UX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
 
+# Generic F042K6Tx
+GenF0.menu.pnum.GENERIC_F042K6TX=Generic F042K6Tx
+GenF0.menu.pnum.GENERIC_F042K6TX.upload.maximum_size=32768
+GenF0.menu.pnum.GENERIC_F042K6TX.upload.maximum_data_size=6144
+GenF0.menu.pnum.GENERIC_F042K6TX.build.board=GENERIC_F042K6TX
+GenF0.menu.pnum.GENERIC_F042K6TX.build.product_line=STM32F042x6
+GenF0.menu.pnum.GENERIC_F042K6TX.build.variant=STM32F0xx/F042K(4-6)T
+GenF0.menu.pnum.GENERIC_F042K6TX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
+
 # Generic F042T6Yx
 GenF0.menu.pnum.GENERIC_F042T6YX=Generic F042T6Yx
 GenF0.menu.pnum.GENERIC_F042T6YX.upload.maximum_size=32768
@@ -2507,6 +2673,11 @@ GenF0.menu.upload_method.swdMethod.upload.protocol=swd
 GenF0.menu.upload_method.swdMethod.upload.options=
 GenF0.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+GenF0.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+GenF0.menu.upload_method.jlinkMethod.upload.protocol=jlink
+GenF0.menu.upload_method.jlinkMethod.upload.options=
+GenF0.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 GenF0.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenF0.menu.upload_method.serialMethod.upload.protocol=serial
 GenF0.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -2517,6 +2688,18 @@ GenF0.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenF0.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenF0.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+GenF0.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+GenF0.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+GenF0.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+GenF0.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+GenF0.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+GenF0.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+GenF0.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+GenF0.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+GenF0.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # Generic F1
 GenF1.name=Generic STM32F1 series
@@ -2529,7 +2712,7 @@ GenF1.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSer
 GenF1.build.flash_offset=0x0
 GenF1.upload.maximum_size=0
 GenF1.upload.maximum_data_size=0
-GenF1.debug.server.openocd.scripts.2=target/stm32f1x.cfg
+GenF1.openocd.target=stm32f1x
 GenF1.vid.0=0x0483
 GenF1.pid.0=0x5740
 # DFU mode on built-in bootloader not available, assuming using STM32duino-bootloader
@@ -3327,6 +3510,11 @@ GenF1.menu.upload_method.swdMethod.upload.protocol=swd
 GenF1.menu.upload_method.swdMethod.upload.options=
 GenF1.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+GenF1.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+GenF1.menu.upload_method.jlinkMethod.upload.protocol=jlink
+GenF1.menu.upload_method.jlinkMethod.upload.options=
+GenF1.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 GenF1.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenF1.menu.upload_method.serialMethod.upload.protocol=serial
 GenF1.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -3361,6 +3549,14 @@ GenF1.menu.upload_method.dfuoMethod.upload.altID=1
 GenF1.menu.upload_method.dfuoMethod.build.flash_offset=0x5000
 GenF1.menu.upload_method.dfuoMethod.build.bootloader_flags=-DBL_LEGACY_LEAF
 
+GenF1.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+GenF1.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+GenF1.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+GenF1.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+GenF1.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+GenF1.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # Generic F2
 GenF2.name=Generic STM32F2 series
@@ -3373,7 +3569,7 @@ GenF2.build.series=STM32F2xx
 GenF2.build.flash_offset=0x0
 GenF2.upload.maximum_size=0
 GenF2.upload.maximum_data_size=0
-GenF2.debug.server.openocd.scripts.2=target/stm32f2x.cfg
+GenF2.openocd.target=stm32f2x
 GenF2.vid.0=0x0483
 GenF2.pid.0=0x5740
 
@@ -3806,6 +4002,11 @@ GenF2.menu.upload_method.swdMethod.upload.protocol=swd
 GenF2.menu.upload_method.swdMethod.upload.options=
 GenF2.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+GenF2.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+GenF2.menu.upload_method.jlinkMethod.upload.protocol=jlink
+GenF2.menu.upload_method.jlinkMethod.upload.options=
+GenF2.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 GenF2.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenF2.menu.upload_method.serialMethod.upload.protocol=serial
 GenF2.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -3816,6 +4017,18 @@ GenF2.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenF2.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenF2.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+GenF2.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+GenF2.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+GenF2.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+GenF2.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+GenF2.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+GenF2.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+GenF2.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+GenF2.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+GenF2.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # Generic F3
 
@@ -3831,7 +4044,7 @@ GenF3.build.series=STM32F3xx
 GenF3.build.flash_offset=0x0
 GenF3.upload.maximum_size=0
 GenF3.upload.maximum_data_size=0
-GenF3.debug.server.openocd.scripts.2=target/stm32f3x.cfg
+GenF3.openocd.target=stm32f3x
 GenF3.vid.0=0x0483
 GenF3.pid.0=0x5740
 
@@ -4257,6 +4470,11 @@ GenF3.menu.upload_method.swdMethod.upload.protocol=swd
 GenF3.menu.upload_method.swdMethod.upload.options=
 GenF3.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+GenF3.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+GenF3.menu.upload_method.jlinkMethod.upload.protocol=jlink
+GenF3.menu.upload_method.jlinkMethod.upload.options=
+GenF3.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 GenF3.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenF3.menu.upload_method.serialMethod.upload.protocol=serial
 GenF3.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -4271,6 +4489,14 @@ GenF3.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
 GenF3.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
 GenF3.menu.upload_method.bmpMethod.upload.tool=bmp_upload
 
+GenF3.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+GenF3.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+GenF3.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+GenF3.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+GenF3.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+GenF3.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # Generic F4
 
@@ -4286,7 +4512,7 @@ GenF4.build.series=STM32F4xx
 GenF4.build.flash_offset=0x0
 GenF4.upload.maximum_size=0
 GenF4.upload.maximum_data_size=0
-GenF4.debug.server.openocd.scripts.2=target/stm32f4x.cfg
+GenF4.openocd.target=stm32f4x
 GenF4.vid.0=0x0483
 GenF4.pid.0=0x5740
 
@@ -5266,6 +5492,11 @@ GenF4.menu.upload_method.swdMethod.upload.protocol=swd
 GenF4.menu.upload_method.swdMethod.upload.options=
 GenF4.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+GenF4.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+GenF4.menu.upload_method.jlinkMethod.upload.protocol=jlink
+GenF4.menu.upload_method.jlinkMethod.upload.options=
+GenF4.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 GenF4.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenF4.menu.upload_method.serialMethod.upload.protocol=serial
 GenF4.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -5286,6 +5517,14 @@ GenF4.menu.upload_method.hidMethod.upload.tool=hid_upload
 GenF4.menu.upload_method.hidMethod.build.flash_offset=0x4000
 GenF4.menu.upload_method.hidMethod.build.bootloader_flags=-DBL_HID
 
+GenF4.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+GenF4.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+GenF4.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+GenF4.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+GenF4.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+GenF4.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # Generic F7
 
@@ -5301,7 +5540,7 @@ GenF7.build.series=STM32F7xx
 GenF7.build.flash_offset=0x0
 GenF7.upload.maximum_size=0
 GenF7.upload.maximum_data_size=0
-GenF7.debug.server.openocd.scripts.2=target/stm32f7x.cfg
+GenF7.openocd.target=stm32f7x
 GenF7.vid.0=0x0483
 GenF7.pid.0=0x5740
 
@@ -5806,6 +6045,11 @@ GenF7.menu.upload_method.swdMethod.upload.protocol=swd
 GenF7.menu.upload_method.swdMethod.upload.options=
 GenF7.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+GenF7.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+GenF7.menu.upload_method.jlinkMethod.upload.protocol=jlink
+GenF7.menu.upload_method.jlinkMethod.upload.options=
+GenF7.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 GenF7.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenF7.menu.upload_method.serialMethod.upload.protocol=serial
 GenF7.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -5816,6 +6060,18 @@ GenF7.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenF7.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenF7.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+GenF7.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+GenF7.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+GenF7.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+GenF7.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+GenF7.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+GenF7.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+GenF7.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+GenF7.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+GenF7.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ###############################
 # Generic G0
 GenG0.name=Generic STM32G0 series
@@ -5828,7 +6084,7 @@ GenG0.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSer
 GenG0.build.flash_offset=0x0
 GenG0.upload.maximum_size=0
 GenG0.upload.maximum_data_size=0
-GenG0.debug.server.openocd.scripts.2=target/stm32g0x.cfg
+GenG0.openocd.target=stm32g0x
 GenG0.vid.0=0x0483
 GenG0.pid.0=0x5740
 
@@ -7217,6 +7473,11 @@ GenG0.menu.upload_method.swdMethod.upload.protocol=swd
 GenG0.menu.upload_method.swdMethod.upload.options=
 GenG0.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+GenG0.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+GenG0.menu.upload_method.jlinkMethod.upload.protocol=jlink
+GenG0.menu.upload_method.jlinkMethod.upload.options=
+GenG0.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 GenG0.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenG0.menu.upload_method.serialMethod.upload.protocol=serial
 GenG0.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -7227,6 +7488,18 @@ GenG0.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenG0.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenG0.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+GenG0.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+GenG0.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+GenG0.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+GenG0.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+GenG0.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+GenG0.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+GenG0.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+GenG0.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+GenG0.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ###############################
 # Generic G4
 GenG4.name=Generic STM32G4 series
@@ -7241,10 +7514,20 @@ GenG4.build.series=STM32G4xx
 GenG4.build.flash_offset=0x0
 GenG4.upload.maximum_size=0
 GenG4.upload.maximum_data_size=0
-GenG4.debug.server.openocd.scripts.2=target/stm32g4x.cfg
+GenG4.openocd.target=stm32g4x
 GenG4.vid.0=0x0483
 GenG4.pid.0=0x5740
 
+# WEACT_G474CE board
+GenG4.menu.pnum.WEACT_G474CE=WeAct G474CE
+GenG4.menu.pnum.WEACT_G474CE.upload.maximum_size=524288
+GenG4.menu.pnum.WEACT_G474CE.upload.maximum_data_size=131072
+GenG4.menu.pnum.WEACT_G474CE.build.board=WEACT_G474CE
+GenG4.menu.pnum.WEACT_G474CE.build.product_line=STM32G474xx
+GenG4.menu.pnum.WEACT_G474CE.build.variant=STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU
+GenG4.menu.pnum.WEACT_G474CE.build.variant_h=variant_{build.board}.h
+GenG4.menu.pnum.WEACT_G474CE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
+
 # Generic G431C6Tx
 GenG4.menu.pnum.GENERIC_G431C6TX=Generic G431C6Tx
 GenG4.menu.pnum.GENERIC_G431C6TX.upload.maximum_size=32768
@@ -7386,7 +7669,7 @@ GenG4.menu.pnum.GENERIC_G431R6IX.upload.maximum_size=32768
 GenG4.menu.pnum.GENERIC_G431R6IX.upload.maximum_data_size=32768
 GenG4.menu.pnum.GENERIC_G431R6IX.build.board=GENERIC_G431R6IX
 GenG4.menu.pnum.GENERIC_G431R6IX.build.product_line=STM32G431xx
-GenG4.menu.pnum.GENERIC_G431R6IX.build.variant=STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)
+GenG4.menu.pnum.GENERIC_G431R6IX.build.variant=STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)
 GenG4.menu.pnum.GENERIC_G431R6IX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G431.svd
 
 # Generic G431R8Ix
@@ -7395,7 +7678,7 @@ GenG4.menu.pnum.GENERIC_G431R8IX.upload.maximum_size=65536
 GenG4.menu.pnum.GENERIC_G431R8IX.upload.maximum_data_size=32768
 GenG4.menu.pnum.GENERIC_G431R8IX.build.board=GENERIC_G431R8IX
 GenG4.menu.pnum.GENERIC_G431R8IX.build.product_line=STM32G431xx
-GenG4.menu.pnum.GENERIC_G431R8IX.build.variant=STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)
+GenG4.menu.pnum.GENERIC_G431R8IX.build.variant=STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)
 GenG4.menu.pnum.GENERIC_G431R8IX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G431.svd
 
 # Generic G431RBIx
@@ -7404,7 +7687,7 @@ GenG4.menu.pnum.GENERIC_G431RBIX.upload.maximum_size=131072
 GenG4.menu.pnum.GENERIC_G431RBIX.upload.maximum_data_size=32768
 GenG4.menu.pnum.GENERIC_G431RBIX.build.board=GENERIC_G431RBIX
 GenG4.menu.pnum.GENERIC_G431RBIX.build.product_line=STM32G431xx
-GenG4.menu.pnum.GENERIC_G431RBIX.build.variant=STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)
+GenG4.menu.pnum.GENERIC_G431RBIX.build.variant=STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)
 GenG4.menu.pnum.GENERIC_G431RBIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G431.svd
 
 # Generic G431R6Tx
@@ -7413,7 +7696,7 @@ GenG4.menu.pnum.GENERIC_G431R6TX.upload.maximum_size=32768
 GenG4.menu.pnum.GENERIC_G431R6TX.upload.maximum_data_size=32768
 GenG4.menu.pnum.GENERIC_G431R6TX.build.board=GENERIC_G431R6TX
 GenG4.menu.pnum.GENERIC_G431R6TX.build.product_line=STM32G431xx
-GenG4.menu.pnum.GENERIC_G431R6TX.build.variant=STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)
+GenG4.menu.pnum.GENERIC_G431R6TX.build.variant=STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)
 GenG4.menu.pnum.GENERIC_G431R6TX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G431.svd
 
 # Generic G431R8Tx
@@ -7422,7 +7705,7 @@ GenG4.menu.pnum.GENERIC_G431R8TX.upload.maximum_size=65536
 GenG4.menu.pnum.GENERIC_G431R8TX.upload.maximum_data_size=32768
 GenG4.menu.pnum.GENERIC_G431R8TX.build.board=GENERIC_G431R8TX
 GenG4.menu.pnum.GENERIC_G431R8TX.build.product_line=STM32G431xx
-GenG4.menu.pnum.GENERIC_G431R8TX.build.variant=STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)
+GenG4.menu.pnum.GENERIC_G431R8TX.build.variant=STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)
 GenG4.menu.pnum.GENERIC_G431R8TX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G431.svd
 
 # Generic G431RBTx
@@ -7431,9 +7714,18 @@ GenG4.menu.pnum.GENERIC_G431RBTX.upload.maximum_size=131072
 GenG4.menu.pnum.GENERIC_G431RBTX.upload.maximum_data_size=32768
 GenG4.menu.pnum.GENERIC_G431RBTX.build.board=GENERIC_G431RBTX
 GenG4.menu.pnum.GENERIC_G431RBTX.build.product_line=STM32G431xx
-GenG4.menu.pnum.GENERIC_G431RBTX.build.variant=STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)
+GenG4.menu.pnum.GENERIC_G431RBTX.build.variant=STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)
 GenG4.menu.pnum.GENERIC_G431RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G431.svd
 
+# Generic G431RBTxZ
+GenG4.menu.pnum.GENERIC_G431RBTXZ=Generic G431RBTxZ
+GenG4.menu.pnum.GENERIC_G431RBTXZ.upload.maximum_size=131072
+GenG4.menu.pnum.GENERIC_G431RBTXZ.upload.maximum_data_size=32768
+GenG4.menu.pnum.GENERIC_G431RBTXZ.build.board=GENERIC_G431RBTXZ
+GenG4.menu.pnum.GENERIC_G431RBTXZ.build.product_line=STM32G431xx
+GenG4.menu.pnum.GENERIC_G431RBTXZ.build.variant=STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)
+GenG4.menu.pnum.GENERIC_G431RBTXZ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G431.svd
+
 # Generic G431V6Tx
 GenG4.menu.pnum.GENERIC_G431V6TX=Generic G431V6Tx
 GenG4.menu.pnum.GENERIC_G431V6TX.upload.maximum_size=32768
@@ -7512,7 +7804,7 @@ GenG4.menu.pnum.GENERIC_G441RBIX.upload.maximum_size=131072
 GenG4.menu.pnum.GENERIC_G441RBIX.upload.maximum_data_size=32768
 GenG4.menu.pnum.GENERIC_G441RBIX.build.board=GENERIC_G441RBIX
 GenG4.menu.pnum.GENERIC_G441RBIX.build.product_line=STM32G441xx
-GenG4.menu.pnum.GENERIC_G441RBIX.build.variant=STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)
+GenG4.menu.pnum.GENERIC_G441RBIX.build.variant=STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)
 GenG4.menu.pnum.GENERIC_G441RBIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G441.svd
 
 # Generic G441RBTx
@@ -7521,7 +7813,7 @@ GenG4.menu.pnum.GENERIC_G441RBTX.upload.maximum_size=131072
 GenG4.menu.pnum.GENERIC_G441RBTX.upload.maximum_data_size=32768
 GenG4.menu.pnum.GENERIC_G441RBTX.build.board=GENERIC_G441RBTX
 GenG4.menu.pnum.GENERIC_G441RBTX.build.product_line=STM32G441xx
-GenG4.menu.pnum.GENERIC_G441RBTX.build.variant=STM32G4xx/G431R(6-8-B)(I-T)_G441RB(I-T)
+GenG4.menu.pnum.GENERIC_G441RBTX.build.variant=STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)
 GenG4.menu.pnum.GENERIC_G441RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G441.svd
 
 # Generic G441VBTx
@@ -7668,6 +7960,15 @@ GenG4.menu.pnum.GENERIC_G473CBTX.build.product_line=STM32G473xx
 GenG4.menu.pnum.GENERIC_G473CBTX.build.variant=STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET
 GenG4.menu.pnum.GENERIC_G473CBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
 
+# Generic G473CBUx
+GenG4.menu.pnum.GENERIC_G473CBUX=Generic G473CBUx
+GenG4.menu.pnum.GENERIC_G473CBUX.upload.maximum_size=131072
+GenG4.menu.pnum.GENERIC_G473CBUX.upload.maximum_data_size=131072
+GenG4.menu.pnum.GENERIC_G473CBUX.build.board=GENERIC_G473CBUX
+GenG4.menu.pnum.GENERIC_G473CBUX.build.product_line=STM32G473xx
+GenG4.menu.pnum.GENERIC_G473CBUX.build.variant=STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU
+GenG4.menu.pnum.GENERIC_G473CBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
+
 # Generic G473CCTx
 GenG4.menu.pnum.GENERIC_G473CCTX=Generic G473CCTx
 GenG4.menu.pnum.GENERIC_G473CCTX.upload.maximum_size=262144
@@ -7677,6 +7978,15 @@ GenG4.menu.pnum.GENERIC_G473CCTX.build.product_line=STM32G473xx
 GenG4.menu.pnum.GENERIC_G473CCTX.build.variant=STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET
 GenG4.menu.pnum.GENERIC_G473CCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
 
+# Generic G473CCUx
+GenG4.menu.pnum.GENERIC_G473CCUX=Generic G473CCUx
+GenG4.menu.pnum.GENERIC_G473CCUX.upload.maximum_size=262144
+GenG4.menu.pnum.GENERIC_G473CCUX.upload.maximum_data_size=131072
+GenG4.menu.pnum.GENERIC_G473CCUX.build.board=GENERIC_G473CCUX
+GenG4.menu.pnum.GENERIC_G473CCUX.build.product_line=STM32G473xx
+GenG4.menu.pnum.GENERIC_G473CCUX.build.variant=STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU
+GenG4.menu.pnum.GENERIC_G473CCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
+
 # Generic G473CETx
 GenG4.menu.pnum.GENERIC_G473CETX=Generic G473CETx
 GenG4.menu.pnum.GENERIC_G473CETX.upload.maximum_size=524288
@@ -7686,6 +7996,15 @@ GenG4.menu.pnum.GENERIC_G473CETX.build.product_line=STM32G473xx
 GenG4.menu.pnum.GENERIC_G473CETX.build.variant=STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET
 GenG4.menu.pnum.GENERIC_G473CETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
 
+# Generic G473CEUx
+GenG4.menu.pnum.GENERIC_G473CEUX=Generic G473CEUx
+GenG4.menu.pnum.GENERIC_G473CEUX.upload.maximum_size=524288
+GenG4.menu.pnum.GENERIC_G473CEUX.upload.maximum_data_size=131072
+GenG4.menu.pnum.GENERIC_G473CEUX.build.board=GENERIC_G473CEUX
+GenG4.menu.pnum.GENERIC_G473CEUX.build.product_line=STM32G473xx
+GenG4.menu.pnum.GENERIC_G473CEUX.build.variant=STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU
+GenG4.menu.pnum.GENERIC_G473CEUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
+
 # Generic G473MBTx
 GenG4.menu.pnum.GENERIC_G473MBTX=Generic G473MBTx
 GenG4.menu.pnum.GENERIC_G473MBTX.upload.maximum_size=131072
@@ -7746,7 +8065,7 @@ GenG4.menu.pnum.GENERIC_G473RBTX.upload.maximum_size=131072
 GenG4.menu.pnum.GENERIC_G473RBTX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G473RBTX.build.board=GENERIC_G473RBTX
 GenG4.menu.pnum.GENERIC_G473RBTX.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473RBTX.build.variant=STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET
+GenG4.menu.pnum.GENERIC_G473RBTX.build.variant=STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET
 GenG4.menu.pnum.GENERIC_G473RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
 
 # Generic G473RCTx
@@ -7755,7 +8074,7 @@ GenG4.menu.pnum.GENERIC_G473RCTX.upload.maximum_size=262144
 GenG4.menu.pnum.GENERIC_G473RCTX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G473RCTX.build.board=GENERIC_G473RCTX
 GenG4.menu.pnum.GENERIC_G473RCTX.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473RCTX.build.variant=STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET
+GenG4.menu.pnum.GENERIC_G473RCTX.build.variant=STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET
 GenG4.menu.pnum.GENERIC_G473RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
 
 # Generic G473RETx
@@ -7764,7 +8083,7 @@ GenG4.menu.pnum.GENERIC_G473RETX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G473RETX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G473RETX.build.board=GENERIC_G473RETX
 GenG4.menu.pnum.GENERIC_G473RETX.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473RETX.build.variant=STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET
+GenG4.menu.pnum.GENERIC_G473RETX.build.variant=STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET
 GenG4.menu.pnum.GENERIC_G473RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
 
 # Generic G473QBTx
@@ -7773,7 +8092,7 @@ GenG4.menu.pnum.GENERIC_G473QBTX.upload.maximum_size=131072
 GenG4.menu.pnum.GENERIC_G473QBTX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G473QBTX.build.board=GENERIC_G473QBTX
 GenG4.menu.pnum.GENERIC_G473QBTX.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473QBTX.build.variant=STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET
+GenG4.menu.pnum.GENERIC_G473QBTX.build.variant=STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET
 GenG4.menu.pnum.GENERIC_G473QBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
 
 # Generic G473QCTx
@@ -7782,7 +8101,7 @@ GenG4.menu.pnum.GENERIC_G473QCTX.upload.maximum_size=262144
 GenG4.menu.pnum.GENERIC_G473QCTX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G473QCTX.build.board=GENERIC_G473QCTX
 GenG4.menu.pnum.GENERIC_G473QCTX.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473QCTX.build.variant=STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET
+GenG4.menu.pnum.GENERIC_G473QCTX.build.variant=STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET
 GenG4.menu.pnum.GENERIC_G473QCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
 
 # Generic G473QETx
@@ -7791,9 +8110,18 @@ GenG4.menu.pnum.GENERIC_G473QETX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G473QETX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G473QETX.build.board=GENERIC_G473QETX
 GenG4.menu.pnum.GENERIC_G473QETX.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473QETX.build.variant=STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET
+GenG4.menu.pnum.GENERIC_G473QETX.build.variant=STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET
 GenG4.menu.pnum.GENERIC_G473QETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
 
+# Generic G473QETxZ
+GenG4.menu.pnum.GENERIC_G473QETXZ=Generic G473QETxZ
+GenG4.menu.pnum.GENERIC_G473QETXZ.upload.maximum_size=524288
+GenG4.menu.pnum.GENERIC_G473QETXZ.upload.maximum_data_size=131072
+GenG4.menu.pnum.GENERIC_G473QETXZ.build.board=GENERIC_G473QETXZ
+GenG4.menu.pnum.GENERIC_G473QETXZ.build.product_line=STM32G473xx
+GenG4.menu.pnum.GENERIC_G473QETXZ.build.variant=STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET
+GenG4.menu.pnum.GENERIC_G473QETXZ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
+
 # Generic G473VBHx
 GenG4.menu.pnum.GENERIC_G473VBHX=Generic G473VBHx
 GenG4.menu.pnum.GENERIC_G473VBHX.upload.maximum_size=131072
@@ -7857,6 +8185,15 @@ GenG4.menu.pnum.GENERIC_G474CBTX.build.product_line=STM32G474xx
 GenG4.menu.pnum.GENERIC_G474CBTX.build.variant=STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET
 GenG4.menu.pnum.GENERIC_G474CBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
 
+# Generic G474CBUx
+GenG4.menu.pnum.GENERIC_G474CBUX=Generic G474CBUx
+GenG4.menu.pnum.GENERIC_G474CBUX.upload.maximum_size=131072
+GenG4.menu.pnum.GENERIC_G474CBUX.upload.maximum_data_size=131072
+GenG4.menu.pnum.GENERIC_G474CBUX.build.board=GENERIC_G474CBUX
+GenG4.menu.pnum.GENERIC_G474CBUX.build.product_line=STM32G474xx
+GenG4.menu.pnum.GENERIC_G474CBUX.build.variant=STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU
+GenG4.menu.pnum.GENERIC_G474CBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
+
 # Generic G474CCTx
 GenG4.menu.pnum.GENERIC_G474CCTX=Generic G474CCTx
 GenG4.menu.pnum.GENERIC_G474CCTX.upload.maximum_size=262144
@@ -7866,6 +8203,15 @@ GenG4.menu.pnum.GENERIC_G474CCTX.build.product_line=STM32G474xx
 GenG4.menu.pnum.GENERIC_G474CCTX.build.variant=STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET
 GenG4.menu.pnum.GENERIC_G474CCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
 
+# Generic G474CCUx
+GenG4.menu.pnum.GENERIC_G474CCUX=Generic G474CCUx
+GenG4.menu.pnum.GENERIC_G474CCUX.upload.maximum_size=262144
+GenG4.menu.pnum.GENERIC_G474CCUX.upload.maximum_data_size=131072
+GenG4.menu.pnum.GENERIC_G474CCUX.build.board=GENERIC_G474CCUX
+GenG4.menu.pnum.GENERIC_G474CCUX.build.product_line=STM32G474xx
+GenG4.menu.pnum.GENERIC_G474CCUX.build.variant=STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU
+GenG4.menu.pnum.GENERIC_G474CCUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
+
 # Generic G474CETx
 GenG4.menu.pnum.GENERIC_G474CETX=Generic G474CETx
 GenG4.menu.pnum.GENERIC_G474CETX.upload.maximum_size=524288
@@ -7875,6 +8221,15 @@ GenG4.menu.pnum.GENERIC_G474CETX.build.product_line=STM32G474xx
 GenG4.menu.pnum.GENERIC_G474CETX.build.variant=STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET
 GenG4.menu.pnum.GENERIC_G474CETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
 
+# Generic G474CEUx
+GenG4.menu.pnum.GENERIC_G474CEUX=Generic G474CEUx
+GenG4.menu.pnum.GENERIC_G474CEUX.upload.maximum_size=524288
+GenG4.menu.pnum.GENERIC_G474CEUX.upload.maximum_data_size=131072
+GenG4.menu.pnum.GENERIC_G474CEUX.build.board=GENERIC_G474CEUX
+GenG4.menu.pnum.GENERIC_G474CEUX.build.product_line=STM32G474xx
+GenG4.menu.pnum.GENERIC_G474CEUX.build.variant=STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU
+GenG4.menu.pnum.GENERIC_G474CEUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
+
 # Generic G474MBTx
 GenG4.menu.pnum.GENERIC_G474MBTX=Generic G474MBTx
 GenG4.menu.pnum.GENERIC_G474MBTX.upload.maximum_size=131072
@@ -7935,7 +8290,7 @@ GenG4.menu.pnum.GENERIC_G474RBTX.upload.maximum_size=131072
 GenG4.menu.pnum.GENERIC_G474RBTX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G474RBTX.build.board=GENERIC_G474RBTX
 GenG4.menu.pnum.GENERIC_G474RBTX.build.product_line=STM32G474xx
-GenG4.menu.pnum.GENERIC_G474RBTX.build.variant=STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET
+GenG4.menu.pnum.GENERIC_G474RBTX.build.variant=STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET
 GenG4.menu.pnum.GENERIC_G474RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
 
 # Generic G474RCTx
@@ -7944,7 +8299,7 @@ GenG4.menu.pnum.GENERIC_G474RCTX.upload.maximum_size=262144
 GenG4.menu.pnum.GENERIC_G474RCTX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G474RCTX.build.board=GENERIC_G474RCTX
 GenG4.menu.pnum.GENERIC_G474RCTX.build.product_line=STM32G474xx
-GenG4.menu.pnum.GENERIC_G474RCTX.build.variant=STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET
+GenG4.menu.pnum.GENERIC_G474RCTX.build.variant=STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET
 GenG4.menu.pnum.GENERIC_G474RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
 
 # Generic G474RETx
@@ -7953,16 +8308,25 @@ GenG4.menu.pnum.GENERIC_G474RETX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G474RETX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G474RETX.build.board=GENERIC_G474RETX
 GenG4.menu.pnum.GENERIC_G474RETX.build.product_line=STM32G474xx
-GenG4.menu.pnum.GENERIC_G474RETX.build.variant=STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET
+GenG4.menu.pnum.GENERIC_G474RETX.build.variant=STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET
 GenG4.menu.pnum.GENERIC_G474RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
 
+# Generic G473RETxZ
+GenG4.menu.pnum.GENERIC_G473RETXZ=Generic G473RETxZ
+GenG4.menu.pnum.GENERIC_G473RETXZ.upload.maximum_size=524288
+GenG4.menu.pnum.GENERIC_G473RETXZ.upload.maximum_data_size=131072
+GenG4.menu.pnum.GENERIC_G473RETXZ.build.board=GENERIC_G473RETXZ
+GenG4.menu.pnum.GENERIC_G473RETXZ.build.product_line=STM32G473xx
+GenG4.menu.pnum.GENERIC_G473RETXZ.build.variant=STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET
+GenG4.menu.pnum.GENERIC_G473RETXZ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G473.svd
+
 # Generic G474QBTx
 GenG4.menu.pnum.GENERIC_G474QBTX=Generic G474QBTx
 GenG4.menu.pnum.GENERIC_G474QBTX.upload.maximum_size=131072
 GenG4.menu.pnum.GENERIC_G474QBTX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G474QBTX.build.board=GENERIC_G474QBTX
 GenG4.menu.pnum.GENERIC_G474QBTX.build.product_line=STM32G474xx
-GenG4.menu.pnum.GENERIC_G474QBTX.build.variant=STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET
+GenG4.menu.pnum.GENERIC_G474QBTX.build.variant=STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET
 GenG4.menu.pnum.GENERIC_G474QBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
 
 # Generic G474QCTx
@@ -7971,7 +8335,7 @@ GenG4.menu.pnum.GENERIC_G474QCTX.upload.maximum_size=262144
 GenG4.menu.pnum.GENERIC_G474QCTX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G474QCTX.build.board=GENERIC_G474QCTX
 GenG4.menu.pnum.GENERIC_G474QCTX.build.product_line=STM32G474xx
-GenG4.menu.pnum.GENERIC_G474QCTX.build.variant=STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET
+GenG4.menu.pnum.GENERIC_G474QCTX.build.variant=STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET
 GenG4.menu.pnum.GENERIC_G474QCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
 
 # Generic G474QETx
@@ -7980,7 +8344,7 @@ GenG4.menu.pnum.GENERIC_G474QETX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G474QETX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G474QETX.build.board=GENERIC_G474QETX
 GenG4.menu.pnum.GENERIC_G474QETX.build.product_line=STM32G474xx
-GenG4.menu.pnum.GENERIC_G474QETX.build.variant=STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET
+GenG4.menu.pnum.GENERIC_G474QETX.build.variant=STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET
 GenG4.menu.pnum.GENERIC_G474QETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G474.svd
 
 # Generic G474VBHx
@@ -8046,6 +8410,15 @@ GenG4.menu.pnum.GENERIC_G483CETX.build.product_line=STM32G483xx
 GenG4.menu.pnum.GENERIC_G483CETX.build.variant=STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET
 GenG4.menu.pnum.GENERIC_G483CETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G483.svd
 
+# Generic G483CEUx
+GenG4.menu.pnum.GENERIC_G483CEUX=Generic G483CEUx
+GenG4.menu.pnum.GENERIC_G483CEUX.upload.maximum_size=524288
+GenG4.menu.pnum.GENERIC_G483CEUX.upload.maximum_data_size=131072
+GenG4.menu.pnum.GENERIC_G483CEUX.build.board=GENERIC_G483CEUX
+GenG4.menu.pnum.GENERIC_G483CEUX.build.product_line=STM32G483xx
+GenG4.menu.pnum.GENERIC_G483CEUX.build.variant=STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU
+GenG4.menu.pnum.GENERIC_G483CEUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G483.svd
+
 # Generic G483METx
 GenG4.menu.pnum.GENERIC_G483METX=Generic G483METx
 GenG4.menu.pnum.GENERIC_G483METX.upload.maximum_size=524288
@@ -8070,7 +8443,7 @@ GenG4.menu.pnum.GENERIC_G483RETX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G483RETX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G483RETX.build.board=GENERIC_G483RETX
 GenG4.menu.pnum.GENERIC_G483RETX.build.product_line=STM32G483xx
-GenG4.menu.pnum.GENERIC_G483RETX.build.variant=STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET
+GenG4.menu.pnum.GENERIC_G483RETX.build.variant=STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET
 GenG4.menu.pnum.GENERIC_G483RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G483.svd
 
 # Generic G483QETx
@@ -8079,7 +8452,7 @@ GenG4.menu.pnum.GENERIC_G483QETX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G483QETX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G483QETX.build.board=GENERIC_G483QETX
 GenG4.menu.pnum.GENERIC_G483QETX.build.product_line=STM32G483xx
-GenG4.menu.pnum.GENERIC_G483QETX.build.variant=STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET
+GenG4.menu.pnum.GENERIC_G483QETX.build.variant=STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET
 GenG4.menu.pnum.GENERIC_G483QETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G483.svd
 
 # Generic G483VEHx
@@ -8109,6 +8482,15 @@ GenG4.menu.pnum.GENERIC_G484CETX.build.product_line=STM32G484xx
 GenG4.menu.pnum.GENERIC_G484CETX.build.variant=STM32G4xx/G473C(B-C-E)T_G474C(B-C-E)T_G483CET_G484CET
 GenG4.menu.pnum.GENERIC_G484CETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G484.svd
 
+# Generic G484CEUx
+GenG4.menu.pnum.GENERIC_G484CEUX=Generic G484CEUx
+GenG4.menu.pnum.GENERIC_G484CEUX.upload.maximum_size=524288
+GenG4.menu.pnum.GENERIC_G484CEUX.upload.maximum_data_size=131072
+GenG4.menu.pnum.GENERIC_G484CEUX.build.board=GENERIC_G484CEUX
+GenG4.menu.pnum.GENERIC_G484CEUX.build.product_line=STM32G484xx
+GenG4.menu.pnum.GENERIC_G484CEUX.build.variant=STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU
+GenG4.menu.pnum.GENERIC_G484CEUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G484.svd
+
 # Generic G484METx
 GenG4.menu.pnum.GENERIC_G484METX=Generic G484METx
 GenG4.menu.pnum.GENERIC_G484METX.upload.maximum_size=524288
@@ -8133,7 +8515,7 @@ GenG4.menu.pnum.GENERIC_G484QETX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G484QETX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G484QETX.build.board=GENERIC_G484QETX
 GenG4.menu.pnum.GENERIC_G484QETX.build.product_line=STM32G484xx
-GenG4.menu.pnum.GENERIC_G484QETX.build.variant=STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET
+GenG4.menu.pnum.GENERIC_G484QETX.build.variant=STM32G4xx/G473Q(B-C)T_G473QETx(Z)_G474Q(B-C-E)T_G483QET_G484QET
 GenG4.menu.pnum.GENERIC_G484QETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G484.svd
 
 # Generic G484RETx
@@ -8142,7 +8524,7 @@ GenG4.menu.pnum.GENERIC_G484RETX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G484RETX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G484RETX.build.board=GENERIC_G484RETX
 GenG4.menu.pnum.GENERIC_G484RETX.build.product_line=STM32G484xx
-GenG4.menu.pnum.GENERIC_G484RETX.build.variant=STM32G4xx/G473R(B-C-E)T_G474R(B-C-E)T_G483RET_G484RET
+GenG4.menu.pnum.GENERIC_G484RETX.build.variant=STM32G4xx/G473R(B-C)T_G473RETx(Z)_G474R(B-C-E)T_G483RET_G484RET
 GenG4.menu.pnum.GENERIC_G484RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G484.svd
 
 # Generic G484VEHx
@@ -8163,15 +8545,6 @@ GenG4.menu.pnum.GENERIC_G484VETX.build.product_line=STM32G484xx
 GenG4.menu.pnum.GENERIC_G484VETX.build.variant=STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)
 GenG4.menu.pnum.GENERIC_G484VETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G484.svd
 
-# Generic G484QETx
-GenG4.menu.pnum.GENERIC_G484QETX=Generic G484QETx
-GenG4.menu.pnum.GENERIC_G484QETX.upload.maximum_size=524288
-GenG4.menu.pnum.GENERIC_G484QETX.upload.maximum_data_size=131072
-GenG4.menu.pnum.GENERIC_G484QETX.build.board=GENERIC_G484QETX
-GenG4.menu.pnum.GENERIC_G484QETX.build.product_line=STM32G484xx
-GenG4.menu.pnum.GENERIC_G484QETX.build.variant=STM32G4xx/G473Q(B-C-E)T_G474Q(B-C-E)T_G483QET_G484QET
-GenG4.menu.pnum.GENERIC_G484QETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G484.svd
-
 # Generic G491CCTx
 GenG4.menu.pnum.GENERIC_G491CCTX=Generic G491CCTx
 GenG4.menu.pnum.GENERIC_G491CCTX.upload.maximum_size=262144
@@ -8250,7 +8623,7 @@ GenG4.menu.pnum.GENERIC_G491RCIX.upload.maximum_size=262144
 GenG4.menu.pnum.GENERIC_G491RCIX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G491RCIX.build.board=GENERIC_G491RCIX
 GenG4.menu.pnum.GENERIC_G491RCIX.build.product_line=STM32G491xx
-GenG4.menu.pnum.GENERIC_G491RCIX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)
+GenG4.menu.pnum.GENERIC_G491RCIX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)
 GenG4.menu.pnum.GENERIC_G491RCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G491.svd
 
 # Generic G491REIx
@@ -8259,7 +8632,7 @@ GenG4.menu.pnum.GENERIC_G491REIX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G491REIX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G491REIX.build.board=GENERIC_G491REIX
 GenG4.menu.pnum.GENERIC_G491REIX.build.product_line=STM32G491xx
-GenG4.menu.pnum.GENERIC_G491REIX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)
+GenG4.menu.pnum.GENERIC_G491REIX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)
 GenG4.menu.pnum.GENERIC_G491REIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G491.svd
 
 # Generic G491RCTx
@@ -8268,7 +8641,7 @@ GenG4.menu.pnum.GENERIC_G491RCTX.upload.maximum_size=262144
 GenG4.menu.pnum.GENERIC_G491RCTX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G491RCTX.build.board=GENERIC_G491RCTX
 GenG4.menu.pnum.GENERIC_G491RCTX.build.product_line=STM32G491xx
-GenG4.menu.pnum.GENERIC_G491RCTX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)
+GenG4.menu.pnum.GENERIC_G491RCTX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)
 GenG4.menu.pnum.GENERIC_G491RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G491.svd
 
 # Generic G491RETx
@@ -8277,16 +8650,24 @@ GenG4.menu.pnum.GENERIC_G491RETX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G491RETX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G491RETX.build.board=GENERIC_G491RETX
 GenG4.menu.pnum.GENERIC_G491RETX.build.product_line=STM32G491xx
-GenG4.menu.pnum.GENERIC_G491RETX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)
+GenG4.menu.pnum.GENERIC_G491RETX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)
 GenG4.menu.pnum.GENERIC_G491RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G491.svd
 
+# Generic G491RETxZ
+GenG4.menu.pnum.GENERIC_G491RETXZ=Generic G491RETxZ
+GenG4.menu.pnum.GENERIC_G491RETXZ.upload.maximum_size=524288
+GenG4.menu.pnum.GENERIC_G491RETXZ.upload.maximum_data_size=131072
+GenG4.menu.pnum.GENERIC_G491RETXZ.build.board=GENERIC_G491RETXZ
+GenG4.menu.pnum.GENERIC_G491RETXZ.build.product_line=STM32G491xx
+GenG4.menu.pnum.GENERIC_G491RETXZ.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)
+
 # Generic G491REYx
 GenG4.menu.pnum.GENERIC_G491REYX=Generic G491REYx
 GenG4.menu.pnum.GENERIC_G491REYX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G491REYX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G491REYX.build.board=GENERIC_G491REYX
 GenG4.menu.pnum.GENERIC_G491REYX.build.product_line=STM32G491xx
-GenG4.menu.pnum.GENERIC_G491REYX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)
+GenG4.menu.pnum.GENERIC_G491REYX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)
 GenG4.menu.pnum.GENERIC_G491REYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G491.svd
 
 # Generic G491VCTx
@@ -8313,7 +8694,7 @@ GenG4.menu.pnum.GENERIC_G4A1REIX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G4A1REIX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G4A1REIX.build.board=GENERIC_G4A1REIX
 GenG4.menu.pnum.GENERIC_G4A1REIX.build.product_line=STM32G4A1xx
-GenG4.menu.pnum.GENERIC_G4A1REIX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)
+GenG4.menu.pnum.GENERIC_G4A1REIX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)
 GenG4.menu.pnum.GENERIC_G4A1REIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G4A1.svd
 
 # Generic G4A1CETx
@@ -8358,7 +8739,7 @@ GenG4.menu.pnum.GENERIC_G4A1RETX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G4A1RETX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G4A1RETX.build.board=GENERIC_G4A1RETX
 GenG4.menu.pnum.GENERIC_G4A1RETX.build.product_line=STM32G4A1xx
-GenG4.menu.pnum.GENERIC_G4A1RETX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)
+GenG4.menu.pnum.GENERIC_G4A1RETX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)
 GenG4.menu.pnum.GENERIC_G4A1RETX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G4A1.svd
 
 # Generic G4A1REYx
@@ -8367,7 +8748,7 @@ GenG4.menu.pnum.GENERIC_G4A1REYX.upload.maximum_size=524288
 GenG4.menu.pnum.GENERIC_G4A1REYX.upload.maximum_data_size=131072
 GenG4.menu.pnum.GENERIC_G4A1REYX.build.board=GENERIC_G4A1REYX
 GenG4.menu.pnum.GENERIC_G4A1REYX.build.product_line=STM32G4A1xx
-GenG4.menu.pnum.GENERIC_G4A1REYX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)_G4A1RE(I-T-Y)
+GenG4.menu.pnum.GENERIC_G4A1REYX.build.variant=STM32G4xx/G491RC(I-T)_G491RE(I-T-Y)x(Z)_G4A1RE(I-T-Y)
 GenG4.menu.pnum.GENERIC_G4A1REYX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G4xx/STM32G4A1.svd
 
 # Generic G4A1VETx
@@ -8385,6 +8766,11 @@ GenG4.menu.upload_method.swdMethod.upload.protocol=swd
 GenG4.menu.upload_method.swdMethod.upload.options=
 GenG4.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+GenG4.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+GenG4.menu.upload_method.jlinkMethod.upload.protocol=jlink
+GenG4.menu.upload_method.jlinkMethod.upload.options=
+GenG4.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 GenG4.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenG4.menu.upload_method.serialMethod.upload.protocol=serial
 GenG4.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -8395,6 +8781,18 @@ GenG4.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenG4.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenG4.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+GenG4.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+GenG4.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+GenG4.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+GenG4.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+GenG4.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+GenG4.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+GenG4.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+GenG4.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+GenG4.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # Generic H5
 GenH5.name=Generic STM32H5 series
@@ -8410,10 +8808,39 @@ GenH5.build.flash_offset=0x0
 GenH5.upload.maximum_size=0
 GenH5.upload.maximum_data_size=0
 # Current openocd version does not support H5
-# GenH5.debug.server.openocd.scripts.2=target/stm32h5x.cfg
+# GenH5.openocd.target=stm32h5x
 GenH5.vid.0=0x0483
 GenH5.pid.0=0x5740
 
+# WeAct H562RGT
+GenH5.menu.pnum.WEACT_H562RG=WeAct H562RGT
+GenH5.menu.pnum.WEACT_H562RG.upload.maximum_size=1048576
+GenH5.menu.pnum.WEACT_H562RG.upload.maximum_data_size=655360
+GenH5.menu.pnum.WEACT_H562RG.build.board=WEACT_H562RG
+GenH5.menu.pnum.WEACT_H562RG.build.product_line=STM32H562xx
+GenH5.menu.pnum.WEACT_H562RG.build.variant=STM32H5xx/H562R(G-I)T
+GenH5.menu.pnum.WEACT_H562RG.build.variant_h=variant_WEACT_H562RG.h
+GenH5.menu.pnum.WEACT_H562RG.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
+GenH5.menu.pnum.WEACT_H562RG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H5xx/STM32H562.svd
+
+# Generic H503CBTx
+GenH5.menu.pnum.GENERIC_H503CBTX=Generic H503CBTx
+GenH5.menu.pnum.GENERIC_H503CBTX.upload.maximum_size=131072
+GenH5.menu.pnum.GENERIC_H503CBTX.upload.maximum_data_size=32768
+GenH5.menu.pnum.GENERIC_H503CBTX.build.board=GENERIC_H503CBTX
+GenH5.menu.pnum.GENERIC_H503CBTX.build.product_line=STM32H503xx
+GenH5.menu.pnum.GENERIC_H503CBTX.build.variant=STM32H5xx/H503CB(T-U)
+GenH5.menu.pnum.GENERIC_H503CBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H5xx/STM32H503.svd
+
+# Generic H503CBUx
+GenH5.menu.pnum.GENERIC_H503CBUX=Generic H503CBUx
+GenH5.menu.pnum.GENERIC_H503CBUX.upload.maximum_size=131072
+GenH5.menu.pnum.GENERIC_H503CBUX.upload.maximum_data_size=32768
+GenH5.menu.pnum.GENERIC_H503CBUX.build.board=GENERIC_H503CBUX
+GenH5.menu.pnum.GENERIC_H503CBUX.build.product_line=STM32H503xx
+GenH5.menu.pnum.GENERIC_H503CBUX.build.variant=STM32H5xx/H503CB(T-U)
+GenH5.menu.pnum.GENERIC_H503CBUX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H5xx/STM32H503.svd
+
 # Generic H503KBUx
 GenH5.menu.pnum.GENERIC_H503KBUX=Generic H503KBUx
 GenH5.menu.pnum.GENERIC_H503KBUX.upload.maximum_size=131072
@@ -8432,6 +8859,24 @@ GenH5.menu.pnum.GENERIC_H503RBTX.build.product_line=STM32H503xx
 GenH5.menu.pnum.GENERIC_H503RBTX.build.variant=STM32H5xx/H503RBT
 GenH5.menu.pnum.GENERIC_H503RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H5xx/STM32H503.svd
 
+# Generic H562RGTx
+GenH5.menu.pnum.GENERIC_H562RGTX=Generic H562RGTx
+GenH5.menu.pnum.GENERIC_H562RGTX.upload.maximum_size=1048576
+GenH5.menu.pnum.GENERIC_H562RGTX.upload.maximum_data_size=655360
+GenH5.menu.pnum.GENERIC_H562RGTX.build.board=GENERIC_H562RGTX
+GenH5.menu.pnum.GENERIC_H562RGTX.build.product_line=STM32H562xx
+GenH5.menu.pnum.GENERIC_H562RGTX.build.variant=STM32H5xx/H562R(G-I)T
+GenH5.menu.pnum.GENERIC_H562RGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H5xx/STM32H562.svd
+
+# Generic H562RITx
+GenH5.menu.pnum.GENERIC_H562RITX=Generic H562RITx
+GenH5.menu.pnum.GENERIC_H562RITX.upload.maximum_size=2097152
+GenH5.menu.pnum.GENERIC_H562RITX.upload.maximum_data_size=655360
+GenH5.menu.pnum.GENERIC_H562RITX.build.board=GENERIC_H562RITX
+GenH5.menu.pnum.GENERIC_H562RITX.build.product_line=STM32H562xx
+GenH5.menu.pnum.GENERIC_H562RITX.build.variant=STM32H5xx/H562R(G-I)T
+GenH5.menu.pnum.GENERIC_H562RITX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H5xx/STM32H562.svd
+
 # Generic H563IIKxQ
 GenH5.menu.pnum.GENERIC_H563IIKXQ=Generic H563IIKxQ
 GenH5.menu.pnum.GENERIC_H563IIKXQ.upload.maximum_size=2097152
@@ -8510,6 +8955,11 @@ GenH5.menu.upload_method.swdMethod.upload.protocol=swd
 GenH5.menu.upload_method.swdMethod.upload.options=
 GenH5.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+GenH5.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+GenH5.menu.upload_method.jlinkMethod.upload.protocol=jlink
+GenH5.menu.upload_method.jlinkMethod.upload.options=
+GenH5.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 GenH5.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenH5.menu.upload_method.serialMethod.upload.protocol=serial
 GenH5.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -8520,6 +8970,18 @@ GenH5.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenH5.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenH5.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+GenH5.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+GenH5.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+GenH5.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+#GenH5.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+#GenH5.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+#GenH5.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+#GenH5.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+#GenH5.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+#GenH5.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # Generic H7
 GenH7.name=Generic STM32H7 Series
@@ -8534,7 +8996,7 @@ GenH7.build.mcu=cortex-m7
 GenH7.build.flash_offset=0x0
 GenH7.upload.maximum_size=0
 GenH7.upload.maximum_data_size=0
-GenH7.debug.server.openocd.scripts.2=target/stm32h7x.cfg
+GenH7.openocd.target=stm32h7x
 GenH7.vid.0=0x0483
 GenH7.pid.0=0x5740
 
@@ -8545,7 +9007,7 @@ GenH7.menu.pnum.DAISY_SEED.upload.maximum_data_size=524288
 GenH7.menu.pnum.DAISY_SEED.build.board=DAISY_SEED
 GenH7.menu.pnum.DAISY_SEED.build.product_line=STM32H750xx
 GenH7.menu.pnum.DAISY_SEED.build.variant_h=variant_{build.board}.h
-GenH7.menu.pnum.DAISY_SEED.build.variant=STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK
+GenH7.menu.pnum.DAISY_SEED.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
 GenH7.menu.pnum.DAISY_SEED.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 GenH7.menu.pnum.DAISY_SEED.build.ldscript=DAISY_SEED.ld
 GenH7.menu.pnum.DAISY_SEED.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H750.svd
@@ -8557,7 +9019,7 @@ GenH7.menu.pnum.DAISY_PATCH_SM.upload.maximum_data_size=524288
 GenH7.menu.pnum.DAISY_PATCH_SM.build.board=DAISY_PATCH_SM
 GenH7.menu.pnum.DAISY_PATCH_SM.build.product_line=STM32H750xx
 GenH7.menu.pnum.DAISY_PATCH_SM.build.variant_h=variant_{build.board}.h
-GenH7.menu.pnum.DAISY_PATCH_SM.build.variant=STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK
+GenH7.menu.pnum.DAISY_PATCH_SM.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
 GenH7.menu.pnum.DAISY_PATCH_SM.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 GenH7.menu.pnum.DAISY_PATCH_SM.build.ldscript=DAISY_SEED.ld
 GenH7.menu.pnum.DAISY_PATCH_SM.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H750.svd
@@ -8569,7 +9031,7 @@ GenH7.menu.pnum.DAISY_PETAL_SM.upload.maximum_data_size=524288
 GenH7.menu.pnum.DAISY_PETAL_SM.build.board=DAISY_PETAL_SM
 GenH7.menu.pnum.DAISY_PETAL_SM.build.product_line=STM32H750xx
 GenH7.menu.pnum.DAISY_PETAL_SM.build.variant_h=variant_{build.board}.h
-GenH7.menu.pnum.DAISY_PETAL_SM.build.variant=STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK
+GenH7.menu.pnum.DAISY_PETAL_SM.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
 GenH7.menu.pnum.DAISY_PETAL_SM.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 GenH7.menu.pnum.DAISY_PETAL_SM.build.ldscript=DAISY_SEED.ld
 GenH7.menu.pnum.DAISY_PETAL_SM.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H750.svd
@@ -8660,7 +9122,7 @@ GenH7.menu.pnum.GENERIC_H742IGKX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H742IGKX.upload.maximum_data_size=524288
 GenH7.menu.pnum.GENERIC_H742IGKX.build.board=GENERIC_H742IGKX
 GenH7.menu.pnum.GENERIC_H742IGKX.build.product_line=STM32H742xx
-GenH7.menu.pnum.GENERIC_H742IGKX.build.variant=STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK
+GenH7.menu.pnum.GENERIC_H742IGKX.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
 GenH7.menu.pnum.GENERIC_H742IGKX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H742.svd
 
 # Generic H742IIKx
@@ -8669,7 +9131,7 @@ GenH7.menu.pnum.GENERIC_H742IIKX.upload.maximum_size=2097152
 GenH7.menu.pnum.GENERIC_H742IIKX.upload.maximum_data_size=524288
 GenH7.menu.pnum.GENERIC_H742IIKX.build.board=GENERIC_H742IIKX
 GenH7.menu.pnum.GENERIC_H742IIKX.build.product_line=STM32H742xx
-GenH7.menu.pnum.GENERIC_H742IIKX.build.variant=STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK
+GenH7.menu.pnum.GENERIC_H742IIKX.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
 GenH7.menu.pnum.GENERIC_H742IIKX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H742.svd
 
 # Generic H742IGTx
@@ -8678,7 +9140,7 @@ GenH7.menu.pnum.GENERIC_H742IGTX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H742IGTX.upload.maximum_data_size=524288
 GenH7.menu.pnum.GENERIC_H742IGTX.build.board=GENERIC_H742IGTX
 GenH7.menu.pnum.GENERIC_H742IGTX.build.product_line=STM32H742xx
-GenH7.menu.pnum.GENERIC_H742IGTX.build.variant=STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT
+GenH7.menu.pnum.GENERIC_H742IGTX.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
 GenH7.menu.pnum.GENERIC_H742IGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H742.svd
 
 # Generic H742IITx
@@ -8687,7 +9149,7 @@ GenH7.menu.pnum.GENERIC_H742IITX.upload.maximum_size=2097152
 GenH7.menu.pnum.GENERIC_H742IITX.upload.maximum_data_size=524288
 GenH7.menu.pnum.GENERIC_H742IITX.build.board=GENERIC_H742IITX
 GenH7.menu.pnum.GENERIC_H742IITX.build.product_line=STM32H742xx
-GenH7.menu.pnum.GENERIC_H742IITX.build.variant=STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT
+GenH7.menu.pnum.GENERIC_H742IITX.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
 GenH7.menu.pnum.GENERIC_H742IITX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H742.svd
 
 # Generic H742VGHx
@@ -8768,7 +9230,7 @@ GenH7.menu.pnum.GENERIC_H743IGKX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H743IGKX.upload.maximum_data_size=524288
 GenH7.menu.pnum.GENERIC_H743IGKX.build.board=GENERIC_H743IGKX
 GenH7.menu.pnum.GENERIC_H743IGKX.build.product_line=STM32H743xx
-GenH7.menu.pnum.GENERIC_H743IGKX.build.variant=STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK
+GenH7.menu.pnum.GENERIC_H743IGKX.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
 GenH7.menu.pnum.GENERIC_H743IGKX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H743.svd
 
 # Generic H743IGTx
@@ -8777,7 +9239,7 @@ GenH7.menu.pnum.GENERIC_H743IGTX.upload.maximum_size=1048576
 GenH7.menu.pnum.GENERIC_H743IGTX.upload.maximum_data_size=524288
 GenH7.menu.pnum.GENERIC_H743IGTX.build.board=GENERIC_H743IGTX
 GenH7.menu.pnum.GENERIC_H743IGTX.build.product_line=STM32H743xx
-GenH7.menu.pnum.GENERIC_H743IGTX.build.variant=STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT
+GenH7.menu.pnum.GENERIC_H743IGTX.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
 GenH7.menu.pnum.GENERIC_H743IGTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H743.svd
 
 # Generic H743IIKx
@@ -8786,7 +9248,7 @@ GenH7.menu.pnum.GENERIC_H743IIKX.upload.maximum_size=2097152
 GenH7.menu.pnum.GENERIC_H743IIKX.upload.maximum_data_size=524288
 GenH7.menu.pnum.GENERIC_H743IIKX.build.board=GENERIC_H743IIKX
 GenH7.menu.pnum.GENERIC_H743IIKX.build.product_line=STM32H743xx
-GenH7.menu.pnum.GENERIC_H743IIKX.build.variant=STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK
+GenH7.menu.pnum.GENERIC_H743IIKX.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
 GenH7.menu.pnum.GENERIC_H743IIKX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H743.svd
 
 # Generic H743IITx
@@ -8795,7 +9257,7 @@ GenH7.menu.pnum.GENERIC_H743IITX.upload.maximum_size=2097152
 GenH7.menu.pnum.GENERIC_H743IITX.upload.maximum_data_size=524288
 GenH7.menu.pnum.GENERIC_H743IITX.build.board=GENERIC_H743IITX
 GenH7.menu.pnum.GENERIC_H743IITX.build.product_line=STM32H743xx
-GenH7.menu.pnum.GENERIC_H743IITX.build.variant=STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT
+GenH7.menu.pnum.GENERIC_H743IITX.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
 GenH7.menu.pnum.GENERIC_H743IITX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H743.svd
 
 # Generic H743VGHx
@@ -8948,7 +9410,7 @@ GenH7.menu.pnum.GENERIC_H750IBKX.upload.maximum_size=131072
 GenH7.menu.pnum.GENERIC_H750IBKX.upload.maximum_data_size=524288
 GenH7.menu.pnum.GENERIC_H750IBKX.build.board=GENERIC_H750IBKX
 GenH7.menu.pnum.GENERIC_H750IBKX.build.product_line=STM32H750xx
-GenH7.menu.pnum.GENERIC_H750IBKX.build.variant=STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK
+GenH7.menu.pnum.GENERIC_H750IBKX.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
 GenH7.menu.pnum.GENERIC_H750IBKX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H750.svd
 
 # Generic H750IBTx
@@ -8957,7 +9419,7 @@ GenH7.menu.pnum.GENERIC_H750IBTX.upload.maximum_size=131072
 GenH7.menu.pnum.GENERIC_H750IBTX.upload.maximum_data_size=524288
 GenH7.menu.pnum.GENERIC_H750IBTX.build.board=GENERIC_H750IBTX
 GenH7.menu.pnum.GENERIC_H750IBTX.build.product_line=STM32H750xx
-GenH7.menu.pnum.GENERIC_H750IBTX.build.variant=STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT
+GenH7.menu.pnum.GENERIC_H750IBTX.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
 GenH7.menu.pnum.GENERIC_H750IBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H750.svd
 
 # Generic H750VBTx
@@ -8993,7 +9455,7 @@ GenH7.menu.pnum.GENERIC_H753IIKX.upload.maximum_size=2097152
 GenH7.menu.pnum.GENERIC_H753IIKX.upload.maximum_data_size=524288
 GenH7.menu.pnum.GENERIC_H753IIKX.build.board=GENERIC_H753IIKX
 GenH7.menu.pnum.GENERIC_H753IIKX.build.product_line=STM32H753xx
-GenH7.menu.pnum.GENERIC_H753IIKX.build.variant=STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK
+GenH7.menu.pnum.GENERIC_H753IIKX.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
 GenH7.menu.pnum.GENERIC_H753IIKX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H753.svd
 
 # Generic H753IITx
@@ -9002,7 +9464,7 @@ GenH7.menu.pnum.GENERIC_H753IITX.upload.maximum_size=2097152
 GenH7.menu.pnum.GENERIC_H753IITX.upload.maximum_data_size=524288
 GenH7.menu.pnum.GENERIC_H753IITX.build.board=GENERIC_H753IITX
 GenH7.menu.pnum.GENERIC_H753IITX.build.product_line=STM32H753xx
-GenH7.menu.pnum.GENERIC_H753IITX.build.variant=STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT
+GenH7.menu.pnum.GENERIC_H753IITX.build.variant=STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)
 GenH7.menu.pnum.GENERIC_H753IITX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H753.svd
 
 # Generic H753VIHx
@@ -9113,6 +9575,24 @@ GenH7.menu.pnum.GENERIC_H7A3VITX.build.product_line=STM32H7A3xx
 GenH7.menu.pnum.GENERIC_H7A3VITX.build.variant=STM32H7xx/H7A3V(G-I)(H-T)_H7B0VBT_H7B3VI(H-T)
 GenH7.menu.pnum.GENERIC_H7A3VITX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H7A3.svd
 
+# Generic H7A3ZGTxQ
+GenH7.menu.pnum.GENERIC_H7A3ZGTXQ=Generic H7A3ZGTxQ
+GenH7.menu.pnum.GENERIC_H7A3ZGTXQ.upload.maximum_size=1048576
+GenH7.menu.pnum.GENERIC_H7A3ZGTXQ.upload.maximum_data_size=1048576
+GenH7.menu.pnum.GENERIC_H7A3ZGTXQ.build.board=GENERIC_H7A3ZGTXQ
+GenH7.menu.pnum.GENERIC_H7A3ZGTXQ.build.product_line=STM32H7A3xxQ
+GenH7.menu.pnum.GENERIC_H7A3ZGTXQ.build.variant=STM32H7xx/H7A3Z(G-I)TxQ_H7B3ZITxQ
+GenH7.menu.pnum.GENERIC_H7A3ZGTXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H7A3.svd
+
+# Generic H7A3ZITxQ
+GenH7.menu.pnum.GENERIC_H7A3ZITXQ=Generic H7A3ZITxQ
+GenH7.menu.pnum.GENERIC_H7A3ZITXQ.upload.maximum_size=2097152
+GenH7.menu.pnum.GENERIC_H7A3ZITXQ.upload.maximum_data_size=1048576
+GenH7.menu.pnum.GENERIC_H7A3ZITXQ.build.board=GENERIC_H7A3ZITXQ
+GenH7.menu.pnum.GENERIC_H7A3ZITXQ.build.product_line=STM32H7A3xxQ
+GenH7.menu.pnum.GENERIC_H7A3ZITXQ.build.variant=STM32H7xx/H7A3Z(G-I)TxQ_H7B3ZITxQ
+GenH7.menu.pnum.GENERIC_H7A3ZITXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H7A3.svd
+
 # Generic H7B0VBTx
 GenH7.menu.pnum.GENERIC_H7B0VBTX=Generic H7B0VBTx
 GenH7.menu.pnum.GENERIC_H7B0VBTX.upload.maximum_size=131072
@@ -9140,12 +9620,26 @@ GenH7.menu.pnum.GENERIC_H7B3VITX.build.product_line=STM32H7B3xx
 GenH7.menu.pnum.GENERIC_H7B3VITX.build.variant=STM32H7xx/H7A3V(G-I)(H-T)_H7B0VBT_H7B3VI(H-T)
 GenH7.menu.pnum.GENERIC_H7B3VITX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H7B3.svd
 
+# Generic H7B3ZITxQ
+GenH7.menu.pnum.GENERIC_H7B3ZITXQ=Generic H7B3ZITxQ
+GenH7.menu.pnum.GENERIC_H7B3ZITXQ.upload.maximum_size=2097152
+GenH7.menu.pnum.GENERIC_H7B3ZITXQ.upload.maximum_data_size=1048576
+GenH7.menu.pnum.GENERIC_H7B3ZITXQ.build.board=GENERIC_H7B3ZITXQ
+GenH7.menu.pnum.GENERIC_H7B3ZITXQ.build.product_line=STM32H7B3xxQ
+GenH7.menu.pnum.GENERIC_H7B3ZITXQ.build.variant=STM32H7xx/H7A3Z(G-I)TxQ_H7B3ZITxQ
+GenH7.menu.pnum.GENERIC_H7B3ZITXQ.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32H7xx/STM32H7B3.svd
+
 # Upload menu
 GenH7.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
 GenH7.menu.upload_method.swdMethod.upload.protocol=swd
 GenH7.menu.upload_method.swdMethod.upload.options=
 GenH7.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+GenH7.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+GenH7.menu.upload_method.jlinkMethod.upload.protocol=jlink
+GenH7.menu.upload_method.jlinkMethod.upload.options=
+GenH7.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 GenH7.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenH7.menu.upload_method.serialMethod.upload.protocol=serial
 GenH7.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -9156,6 +9650,18 @@ GenH7.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenH7.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenH7.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+GenH7.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+GenH7.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+GenH7.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+GenH7.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+GenH7.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+GenH7.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+GenH7.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+GenH7.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+GenH7.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # Generic L0
 GenL0.name=Generic STM32L0 series
@@ -9168,7 +9674,7 @@ GenL0.build.series=STM32L0xx
 GenL0.build.flash_offset=0x0
 GenL0.upload.maximum_size=0
 GenL0.upload.maximum_data_size=0
-GenL0.debug.server.openocd.scripts.2=target/stm32l0x.cfg
+GenL0.openocd.target=stm32l0
 GenL0.vid.0=0x0483
 GenL0.pid.0=0x5740
 
@@ -10424,6 +10930,11 @@ GenL0.menu.upload_method.swdMethod.upload.protocol=swd
 GenL0.menu.upload_method.swdMethod.upload.options=
 GenL0.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+GenL0.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+GenL0.menu.upload_method.jlinkMethod.upload.protocol=jlink
+GenL0.menu.upload_method.jlinkMethod.upload.options=
+GenL0.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 GenL0.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenL0.menu.upload_method.serialMethod.upload.protocol=serial
 GenL0.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -10438,6 +10949,14 @@ GenL0.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
 GenL0.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
 GenL0.menu.upload_method.bmpMethod.upload.tool=bmp_upload
 
+GenL0.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+GenL0.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+GenL0.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+GenL0.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+GenL0.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+GenL0.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # Generic L1
 GenL1.name=Generic STM32L1 series
@@ -10450,7 +10969,7 @@ GenL1.build.series=STM32L1xx
 GenL1.build.flash_offset=0x0
 GenL1.upload.maximum_size=0
 GenL1.upload.maximum_data_size=0
-GenL1.debug.server.openocd.scripts.2=target/stm32l1x.cfg
+GenL1.openocd.target=stm32l1
 GenL1.vid.0=0x0483
 GenL1.pid.0=0x5740
 
@@ -10468,7 +10987,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
 
@@ -10504,7 +11023,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
 
@@ -10513,7 +11032,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
 
@@ -10522,7 +11041,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
 
@@ -10558,7 +11077,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
 
@@ -10567,7 +11086,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
 
@@ -10576,7 +11095,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
 
@@ -10621,7 +11140,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
 
@@ -10630,7 +11149,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
 
@@ -10639,7 +11158,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
 
@@ -10675,7 +11194,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
 
@@ -10684,7 +11203,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
 
@@ -10693,7 +11212,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
 
@@ -10748,6 +11267,11 @@ GenL1.menu.upload_method.swdMethod.upload.protocol=swd
 GenL1.menu.upload_method.swdMethod.upload.options=
 GenL1.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+GenL1.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+GenL1.menu.upload_method.jlinkMethod.upload.protocol=jlink
+GenL1.menu.upload_method.jlinkMethod.upload.options=
+GenL1.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 GenL1.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenL1.menu.upload_method.serialMethod.upload.protocol=serial
 GenL1.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -10758,6 +11282,18 @@ GenL1.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenL1.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenL1.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+GenL1.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+GenL1.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+GenL1.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+GenL1.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+GenL1.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+GenL1.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+GenL1.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+GenL1.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+GenL1.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # Generic L4
 GenL4.name=Generic STM32L4 series
@@ -10772,7 +11308,7 @@ GenL4.build.series=STM32L4xx
 GenL4.build.flash_offset=0x0
 GenL4.upload.maximum_size=0
 GenL4.upload.maximum_data_size=0
-GenL4.debug.server.openocd.scripts.2=target/stm32l4x.cfg
+GenL4.openocd.target=stm32l4x
 GenL4.vid.0=0x0483
 GenL4.pid.0=0x5740
 
@@ -11548,6 +12084,11 @@ GenL4.menu.upload_method.swdMethod.upload.protocol=swd
 GenL4.menu.upload_method.swdMethod.upload.options=
 GenL4.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+GenL4.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+GenL4.menu.upload_method.jlinkMethod.upload.protocol=jlink
+GenL4.menu.upload_method.jlinkMethod.upload.options=
+GenL4.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 GenL4.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenL4.menu.upload_method.serialMethod.upload.protocol=serial
 GenL4.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -11558,6 +12099,18 @@ GenL4.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenL4.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenL4.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+GenL4.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+GenL4.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+GenL4.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+GenL4.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+GenL4.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+GenL4.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+GenL4.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+GenL4.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+GenL4.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # Generic L5
 GenL5.name=Generic STM32L5 series
@@ -11572,7 +12125,7 @@ GenL5.build.series=STM32L5xx
 GenL5.build.flash_offset=0x0
 GenL5.upload.maximum_size=0
 GenL5.upload.maximum_data_size=0
-GenL5.debug.server.openocd.scripts.2=target/stm32l5x.cfg
+GenL5.openocd.target=stm32l5x
 GenL5.vid.0=0x0483
 GenL5.pid.0=0x5740
 
@@ -11609,6 +12162,11 @@ GenL5.menu.upload_method.swdMethod.upload.protocol=swd
 GenL5.menu.upload_method.swdMethod.upload.options=
 GenL5.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+GenL5.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+GenL5.menu.upload_method.jlinkMethod.upload.protocol=jlink
+GenL5.menu.upload_method.jlinkMethod.upload.options=
+GenL5.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 GenL5.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenL5.menu.upload_method.serialMethod.upload.protocol=serial
 GenL5.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -11619,6 +12177,136 @@ GenL5.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenL5.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenL5.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+GenL5.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+GenL5.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+GenL5.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+GenL5.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+GenL5.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+GenL5.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+GenL5.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+GenL5.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+GenL5.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
+###############################
+# Generic U0
+GenU0.name=Generic STM32U0 series
+
+GenU0.build.core=arduino
+GenU0.build.board=GenG0
+GenU0.build.mcu=cortex-m0plus
+GenU0.build.series=STM32U0xx
+GenU0.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
+GenU0.build.flash_offset=0x0
+GenU0.upload.maximum_size=0
+GenU0.upload.maximum_data_size=0
+# Current openocd version does not support U0
+# GenU0.openocd.target=stm32u0x
+GenU0.vid.0=0x0483
+GenU0.pid.0=0x5740
+
+# Generic U073R8Ix
+GenU0.menu.pnum.GENERIC_U073R8IX=Generic U073R8Ix
+GenU0.menu.pnum.GENERIC_U073R8IX.upload.maximum_size=65536
+GenU0.menu.pnum.GENERIC_U073R8IX.upload.maximum_data_size=40960
+GenU0.menu.pnum.GENERIC_U073R8IX.build.board=GENERIC_U073R8IX
+GenU0.menu.pnum.GENERIC_U073R8IX.build.product_line=STM32U073xx
+GenU0.menu.pnum.GENERIC_U073R8IX.build.variant=STM32U0xx/U073R(8-B-C)(I-T)_U083RC(I-T)
+GenU0.menu.pnum.GENERIC_U073R8IX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U0xx/STM32U073.svd
+
+# Generic U073R8Tx
+GenU0.menu.pnum.GENERIC_U073R8TX=Generic U073R8Tx
+GenU0.menu.pnum.GENERIC_U073R8TX.upload.maximum_size=65536
+GenU0.menu.pnum.GENERIC_U073R8TX.upload.maximum_data_size=40960
+GenU0.menu.pnum.GENERIC_U073R8TX.build.board=GENERIC_U073R8TX
+GenU0.menu.pnum.GENERIC_U073R8TX.build.product_line=STM32U073xx
+GenU0.menu.pnum.GENERIC_U073R8TX.build.variant=STM32U0xx/U073R(8-B-C)(I-T)_U083RC(I-T)
+GenU0.menu.pnum.GENERIC_U073R8TX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U0xx/STM32U073.svd
+
+# Generic U073RBIx
+GenU0.menu.pnum.GENERIC_U073RBIX=Generic U073RBIx
+GenU0.menu.pnum.GENERIC_U073RBIX.upload.maximum_size=131072
+GenU0.menu.pnum.GENERIC_U073RBIX.upload.maximum_data_size=40960
+GenU0.menu.pnum.GENERIC_U073RBIX.build.board=GENERIC_U073RBIX
+GenU0.menu.pnum.GENERIC_U073RBIX.build.product_line=STM32U073xx
+GenU0.menu.pnum.GENERIC_U073RBIX.build.variant=STM32U0xx/U073R(8-B-C)(I-T)_U083RC(I-T)
+GenU0.menu.pnum.GENERIC_U073RBIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U0xx/STM32U073.svd
+
+# Generic U073RBTx
+GenU0.menu.pnum.GENERIC_U073RBTX=Generic U073RBTx
+GenU0.menu.pnum.GENERIC_U073RBTX.upload.maximum_size=131072
+GenU0.menu.pnum.GENERIC_U073RBTX.upload.maximum_data_size=40960
+GenU0.menu.pnum.GENERIC_U073RBTX.build.board=GENERIC_U073RBTX
+GenU0.menu.pnum.GENERIC_U073RBTX.build.product_line=STM32U073xx
+GenU0.menu.pnum.GENERIC_U073RBTX.build.variant=STM32U0xx/U073R(8-B-C)(I-T)_U083RC(I-T)
+GenU0.menu.pnum.GENERIC_U073RBTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U0xx/STM32U073.svd
+
+# Generic U073RCIx
+GenU0.menu.pnum.GENERIC_U073RCIX=Generic U073RCIx
+GenU0.menu.pnum.GENERIC_U073RCIX.upload.maximum_size=262144
+GenU0.menu.pnum.GENERIC_U073RCIX.upload.maximum_data_size=40960
+GenU0.menu.pnum.GENERIC_U073RCIX.build.board=GENERIC_U073RCIX
+GenU0.menu.pnum.GENERIC_U073RCIX.build.product_line=STM32U073xx
+GenU0.menu.pnum.GENERIC_U073RCIX.build.variant=STM32U0xx/U073R(8-B-C)(I-T)_U083RC(I-T)
+GenU0.menu.pnum.GENERIC_U073RCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U0xx/STM32U073.svd
+
+# Generic U073RCTx
+GenU0.menu.pnum.GENERIC_U073RCTX=Generic U073RCTx
+GenU0.menu.pnum.GENERIC_U073RCTX.upload.maximum_size=262144
+GenU0.menu.pnum.GENERIC_U073RCTX.upload.maximum_data_size=40960
+GenU0.menu.pnum.GENERIC_U073RCTX.build.board=GENERIC_U073RCTX
+GenU0.menu.pnum.GENERIC_U073RCTX.build.product_line=STM32U073xx
+GenU0.menu.pnum.GENERIC_U073RCTX.build.variant=STM32U0xx/U073R(8-B-C)(I-T)_U083RC(I-T)
+GenU0.menu.pnum.GENERIC_U073RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U0xx/STM32U073.svd
+
+# Generic U083RCIx
+GenU0.menu.pnum.GENERIC_U083RCIX=Generic U083RCIx
+GenU0.menu.pnum.GENERIC_U083RCIX.upload.maximum_size=262144
+GenU0.menu.pnum.GENERIC_U083RCIX.upload.maximum_data_size=40960
+GenU0.menu.pnum.GENERIC_U083RCIX.build.board=GENERIC_U083RCIX
+GenU0.menu.pnum.GENERIC_U083RCIX.build.product_line=STM32U083xx
+GenU0.menu.pnum.GENERIC_U083RCIX.build.variant=STM32U0xx/U073R(8-B-C)(I-T)_U083RC(I-T)
+GenU0.menu.pnum.GENERIC_U083RCIX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U0xx/STM32U083.svd
+
+# Generic U083RCTx
+GenU0.menu.pnum.GENERIC_U083RCTX=Generic U083RCTx
+GenU0.menu.pnum.GENERIC_U083RCTX.upload.maximum_size=262144
+GenU0.menu.pnum.GENERIC_U083RCTX.upload.maximum_data_size=40960
+GenU0.menu.pnum.GENERIC_U083RCTX.build.board=GENERIC_U083RCTX
+GenU0.menu.pnum.GENERIC_U083RCTX.build.product_line=STM32U083xx
+GenU0.menu.pnum.GENERIC_U083RCTX.build.variant=STM32U0xx/U073R(8-B-C)(I-T)_U083RC(I-T)
+GenU0.menu.pnum.GENERIC_U083RCTX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U0xx/STM32U083.svd
+
+# Upload menu
+GenU0.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
+GenU0.menu.upload_method.swdMethod.upload.protocol=swd
+GenU0.menu.upload_method.swdMethod.upload.options=
+GenU0.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
+
+GenU0.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+GenU0.menu.upload_method.jlinkMethod.upload.protocol=jlink
+GenU0.menu.upload_method.jlinkMethod.upload.options=
+GenU0.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
+GenU0.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
+GenU0.menu.upload_method.serialMethod.upload.protocol=serial
+GenU0.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
+GenU0.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
+
+GenU0.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
+GenU0.menu.upload_method.dfuMethod.upload.protocol=dfu
+GenU0.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
+GenU0.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
+
+#GenU0.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+#GenU0.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+#GenU0.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+#GenU0.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+#GenU0.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+#GenU0.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # Generic U5
 GenU5.name=Generic STM32U5 series
@@ -11633,7 +12321,7 @@ GenU5.build.series=STM32U5xx
 GenU5.build.flash_offset=0x0
 GenU5.upload.maximum_size=0
 GenU5.upload.maximum_data_size=0
-GenU5.debug.server.openocd.scripts.2=target/stm32u5x.cfg
+GenU5.openocd.target=stm32u5x
 GenU5.vid.0=0x0483
 GenU5.pid.0=0x5740
 
@@ -11733,6 +12421,11 @@ GenU5.menu.upload_method.swdMethod.upload.protocol=swd
 GenU5.menu.upload_method.swdMethod.upload.options=
 GenU5.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+GenU5.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+GenU5.menu.upload_method.jlinkMethod.upload.protocol=jlink
+GenU5.menu.upload_method.jlinkMethod.upload.options=
+GenU5.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 GenU5.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenU5.menu.upload_method.serialMethod.upload.protocol=serial
 GenU5.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -11743,6 +12436,18 @@ GenU5.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenU5.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenU5.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+GenU5.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+GenU5.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+GenU5.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+GenU5.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+GenU5.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+GenU5.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+GenU5.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+GenU5.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+GenU5.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # Generic WB
 GenWB.name=Generic STM32WB series
@@ -11757,7 +12462,7 @@ GenWB.build.series=STM32WBxx
 GenWB.build.flash_offset=0x0
 GenWB.upload.maximum_size=0
 GenWB.upload.maximum_data_size=0
-GenWB.debug.server.openocd.scripts.2=target/stm32wbx.cfg
+GenWB.openocd.target=stm32wbx
 GenWB.vid.0=0x0483
 GenWB.pid.0=0x5740
 
@@ -11839,6 +12544,11 @@ GenWB.menu.upload_method.swdMethod.upload.protocol=swd
 GenWB.menu.upload_method.swdMethod.upload.options=
 GenWB.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+GenWB.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+GenWB.menu.upload_method.jlinkMethod.upload.protocol=jlink
+GenWB.menu.upload_method.jlinkMethod.upload.options=
+GenWB.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 GenWB.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenWB.menu.upload_method.serialMethod.upload.protocol=serial
 GenWB.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -11849,6 +12559,18 @@ GenWB.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenWB.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenWB.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+GenWB.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+GenWB.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+GenWB.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+GenWB.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+GenWB.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+GenWB.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+GenWB.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+GenWB.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+GenWB.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # Generic WBA
 GenWBA.name=Generic STM32WBA series
@@ -11863,7 +12585,7 @@ GenWBA.build.series=STM32WBAxx
 GenWBA.build.flash_offset=0x0
 GenWBA.upload.maximum_size=0
 GenWBA.upload.maximum_data_size=0
-GenWBA.debug.server.openocd.scripts.2=target/stm32wbax.cfg
+GenWBA.openocd.target=stm32wbax
 
 # Generic WBA55CEUx
 GenWBA.menu.pnum.GENERIC_WBA55CEUX=Generic WBA55CEUx
@@ -11889,11 +12611,24 @@ GenWBA.menu.upload_method.swdMethod.upload.protocol=swd
 GenWBA.menu.upload_method.swdMethod.upload.options=
 GenWBA.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+GenWBA.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+GenWBA.menu.upload_method.jlinkMethod.upload.protocol=jlink
+GenWBA.menu.upload_method.jlinkMethod.upload.options=
+GenWBA.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 GenWBA.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenWBA.menu.upload_method.serialMethod.upload.protocol=serial
 GenWBA.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 GenWBA.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
+GenWBA.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+GenWBA.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+GenWBA.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+GenWBA.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+GenWBA.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+GenWBA.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # Generic WL
 GenWL.name=Generic STM32WL series
@@ -11908,7 +12643,7 @@ GenWL.build.series=STM32WLxx
 GenWL.build.flash_offset=0x0
 GenWL.upload.maximum_size=0
 GenWL.upload.maximum_data_size=0
-GenWL.debug.server.openocd.scripts.2=target/stm32wlx.cfg
+GenWL.openocd.target=stm32wlx
 
 # Generic WL54CCUx
 GenWL.menu.pnum.GENERIC_WL54CCUX=Generic WL54CCUx
@@ -12060,6 +12795,11 @@ GenWL.menu.upload_method.swdMethod.upload.protocol=swd
 GenWL.menu.upload_method.swdMethod.upload.options=
 GenWL.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+GenWL.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+GenWL.menu.upload_method.jlinkMethod.upload.protocol=jlink
+GenWL.menu.upload_method.jlinkMethod.upload.options=
+GenWL.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 GenWL.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenWL.menu.upload_method.serialMethod.upload.protocol=serial
 GenWL.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -12070,6 +12810,18 @@ GenWL.menu.upload_method.dfuMethod.upload.protocol=dfu
 GenWL.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+GenWL.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+GenWL.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+GenWL.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+GenWL.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+GenWL.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+GenWL.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+GenWL.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+GenWL.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+GenWL.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # 3D printer boards
 
@@ -12097,7 +12849,7 @@ GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 3dprinter.menu.pnum.ARMED_V1.build.product_line=STM32F407xx
 3dprinter.menu.pnum.ARMED_V1.build.variant=STM32F4xx/F407V(E-G)T_F417V(E-G)T
 3dprinter.menu.pnum.ARMED_V1.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-3dprinter.menu.pnum.ARMED_V1.debug.server.openocd.scripts.2=target/stm32f4x.cfg
+3dprinter.menu.pnum.ARMED_V1.openocd.target=stm32f4x
 3dprinter.menu.pnum.ARMED_V1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F407.svd
 
 # Big Tree Tech EBB42_V1_1 board
@@ -12110,7 +12862,7 @@ GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 3dprinter.menu.pnum.EBB42_V1_1.build.product_line=STM32G0B1xx
 3dprinter.menu.pnum.EBB42_V1_1.build.variant=STM32G0xx/G0B1C(B-C-E)(T-U)_G0C1C(C-E)(T-U)
 3dprinter.menu.pnum.EBB42_V1_1.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-3dprinter.menu.pnum.EBB42_V1_1.debug.server.openocd.scripts.2=target/stm32g0x.cfg
+3dprinter.menu.pnum.EBB42_V1_1.openocd.target=stm32g0x
 3dprinter.menu.pnum.EBB42_V1_1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32G0xx/STM32G0B1.svd
 
 # REMRAM_V1 board
@@ -12125,7 +12877,7 @@ GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 3dprinter.menu.pnum.REMRAM_V1.build.product_line=STM32F765xx
 3dprinter.menu.pnum.REMRAM_V1.build.variant=STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)
 3dprinter.menu.pnum.REMRAM_V1.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-3dprinter.menu.pnum.REMRAM_V1.debug.server.openocd.scripts.2=target/stm32f7x.cfg
+3dprinter.menu.pnum.REMRAM_V1.openocd.target=stm32f7x
 3dprinter.menu.pnum.REMRAM_V1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F7xx/STM32F765.svd
 
 # RUMBA32 board
@@ -12140,7 +12892,7 @@ GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 3dprinter.menu.pnum.RUMBA32.build.product_line=STM32F446xx
 3dprinter.menu.pnum.RUMBA32.build.variant=STM32F4xx/F446V(C-E)T
 3dprinter.menu.pnum.RUMBA32.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-3dprinter.menu.pnum.RUMBA32.debug.server.openocd.scripts.2=target/stm32f4x.cfg
+3dprinter.menu.pnum.RUMBA32.openocd.target=stm32f4x
 3dprinter.menu.pnum.RUMBA32.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F446.svd
 
 # STEVAL-3DP001V1 board
@@ -12155,7 +12907,7 @@ GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 3dprinter.menu.pnum.ST3DP001_EVAL.build.product_line=STM32F401xE
 3dprinter.menu.pnum.ST3DP001_EVAL.build.variant=STM32F4xx/F401V(B-C-D-E)T
 3dprinter.menu.pnum.ST3DP001_EVAL.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-3dprinter.menu.pnum.ST3DP001_EVAL.debug.server.openocd.scripts.2=target/stm32f4x.cfg
+3dprinter.menu.pnum.ST3DP001_EVAL.openocd.target=stm32f4x
 3dprinter.menu.pnum.ST3DP001_EVAL.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F401.svd
 
 # PRNTR_V1 board
@@ -12170,7 +12922,7 @@ GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 3dprinter.menu.pnum.PRNTR_V1.build.product_line=STM32F407xx
 3dprinter.menu.pnum.PRNTR_V1.build.variant=STM32F4xx/F407V(E-G)T_F417V(E-G)T
 3dprinter.menu.pnum.PRNTR_V1.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-3dprinter.menu.pnum.PRNTR_V1.debug.server.openocd.scripts.2=target/stm32f4x.cfg
+3dprinter.menu.pnum.PRNTR_V1.openocd.target=stm32f4x
 3dprinter.menu.pnum.PRNTR_V1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F407.svd
 
 # PRNTR_V2 board
@@ -12187,7 +12939,7 @@ GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 3dprinter.menu.pnum.PRNTR_V2.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 3dprinter.menu.pnum.PRNTR_V2.build.flash_offset=0x8000
 3dprinter.menu.pnum.PRNTR_V2.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
-3dprinter.menu.pnum.PRNTR_V2.debug.server.openocd.scripts.2=target/stm32f4x.cfg
+3dprinter.menu.pnum.PRNTR_V2.openocd.target=stm32f4x
 3dprinter.menu.pnum.PRNTR_V2.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F407.svd
 
 # EEXTR_F030_V1 board
@@ -12200,7 +12952,7 @@ GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 3dprinter.menu.pnum.EEXTR_F030_V1.build.product_line=STM32F030x8
 3dprinter.menu.pnum.EEXTR_F030_V1.build.variant=STM32F0xx/F030C8T
 3dprinter.menu.pnum.EEXTR_F030_V1.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-3dprinter.menu.pnum.EEXTR_F030_V1.debug.server.openocd.scripts.2=target/stm32f0x.cfg
+3dprinter.menu.pnum.EEXTR_F030_V1.openocd.target=stm32f0x
 3dprinter.menu.pnum.EEXTR_F030_V1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x0.svd
 
 # MALYANM200_F103CB board
@@ -12216,7 +12968,7 @@ GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 3dprinter.menu.pnum.MALYANM200_F103CB.build.startup_file=-DCUSTOM_STARTUP_FILE
 3dprinter.menu.pnum.MALYANM200_F103CB.build.flash_offset=0x2000
 3dprinter.menu.pnum.MALYANM200_F103CB.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
-3dprinter.menu.pnum.MALYANM200_F103CB.debug.server.openocd.scripts.2=target/stm32f1x.cfg
+3dprinter.menu.pnum.MALYANM200_F103CB.openocd.target=stm32f1x
 3dprinter.menu.pnum.MALYANM200_F103CB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F103.svd
 
 # MALYANM200_F070CB board
@@ -12233,7 +12985,7 @@ GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 3dprinter.menu.pnum.MALYANM200_F070CB.build.ldscript=MALYANMx00_F070CB.ld
 3dprinter.menu.pnum.MALYANM200_F070CB.build.flash_offset=0x2000
 3dprinter.menu.pnum.MALYANM200_F070CB.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
-3dprinter.menu.pnum.MALYANM200_F070CB.debug.server.openocd.scripts.2=target/stm32f0x.cfg
+3dprinter.menu.pnum.MALYANM200_F070CB.openocd.target=stm32f0x
 3dprinter.menu.pnum.MALYANM200_F070CB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x0.svd
 
 # MALYANM300_F070CB board
@@ -12250,7 +13002,7 @@ GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 3dprinter.menu.pnum.MALYANM200_F070CB.build.ldscript=MALYANMx00_F070CB.ld
 3dprinter.menu.pnum.MALYANM300_F070CB.build.flash_offset=0x2000
 3dprinter.menu.pnum.MALYANM300_F070CB.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
-3dprinter.menu.pnum.MALYANM300_F070CB.debug.server.openocd.scripts.2=target/stm32f0x.cfg
+3dprinter.menu.pnum.MALYANM300_F070CB.openocd.target=stm32f0x
 3dprinter.menu.pnum.MALYANM300_F070CB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x0.svd
 
 # VAkE v1.0
@@ -12265,7 +13017,7 @@ GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 3dprinter.menu.pnum.VAKE_V1.build.product_line=STM32F446xx
 3dprinter.menu.pnum.VAKE_V1.build.variant=STM32F4xx/F446V(C-E)T
 3dprinter.menu.pnum.VAKE_V1.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-3dprinter.menu.pnum.VAKE_V1.debug.server.openocd.scripts.2=target/stm32f4x.cfg
+3dprinter.menu.pnum.VAKE_V1.openocd.target=stm32f4x
 3dprinter.menu.pnum.VAKE_V1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F446.svd
 
 # FYSETC_S6 board
@@ -12282,7 +13034,7 @@ GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 3dprinter.menu.pnum.FYSETC_S6.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 3dprinter.menu.pnum.FYSETC_S6.build.flash_offset=0x10000
 3dprinter.menu.pnum.FYSETC_S6.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
-3dprinter.menu.pnum.FYSETC_S6.debug.server.openocd.scripts.2=target/stm32f4x.cfg
+3dprinter.menu.pnum.FYSETC_S6.openocd.target=stm32f4x
 3dprinter.menu.pnum.FYSETC_S6.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F446.svd
 
 # Upload menu
@@ -12291,6 +13043,11 @@ GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 3dprinter.menu.upload_method.swdMethod.upload.options=
 3dprinter.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+3dprinter.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+3dprinter.menu.upload_method.jlinkMethod.upload.protocol=jlink
+3dprinter.menu.upload_method.jlinkMethod.upload.options=
+3dprinter.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 3dprinter.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 3dprinter.menu.upload_method.serialMethod.upload.protocol=serial
 3dprinter.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -12301,6 +13058,18 @@ GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 3dprinter.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 3dprinter.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+3dprinter.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+3dprinter.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+3dprinter.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+3dprinter.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+3dprinter.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+3dprinter.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+3dprinter.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+3dprinter.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+3dprinter.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # Blues boards
 
@@ -12313,7 +13082,6 @@ Blues.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSer
 Blues.build.flash_offset=0x0
 Blues.upload.maximum_size=0
 Blues.upload.maximum_data_size=0
-Blues.vid.0=0x30A4
 
 # Swan R5 board
 Blues.menu.pnum.SWAN_R5=Swan R5
@@ -12327,8 +13095,9 @@ Blues.menu.pnum.SWAN_R5.build.series=STM32L4xx
 Blues.menu.pnum.SWAN_R5.build.product_line=STM32L4R5xx
 Blues.menu.pnum.SWAN_R5.build.variant=STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY
 Blues.menu.pnum.SWAN_R5.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
+Blues.menu.pnum.SWAN_R5.vid.0=0x30A4
 Blues.menu.pnum.SWAN_R5.pid.0=0x0002
-Blues.menu.pnum.SWAN_R5.debug.server.openocd.scripts.2=target/stm32l4x.cfg
+Blues.menu.pnum.SWAN_R5.openocd.target=stm32l4x
 Blues.menu.pnum.SWAN_R5.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4R5.svd
 
 # Cygnet board
@@ -12343,8 +13112,9 @@ Blues.menu.pnum.CYGNET.build.series=STM32L4xx
 Blues.menu.pnum.CYGNET.build.product_line=STM32L433xx
 Blues.menu.pnum.CYGNET.build.variant=STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)
 Blues.menu.pnum.CYGNET.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Blues.menu.pnum.CYGNET.build.pid=0x0003
-Blues.menu.pnum.CYGNET.debug.server.openocd.scripts.2=target/stm32l4x.cfg
+Blues.menu.pnum.CYGNET.vid.0=0x30A4
+Blues.menu.pnum.CYGNET.pid.0=0x0003
+Blues.menu.pnum.CYGNET.openocd.target=stm32l4x
 Blues.menu.pnum.CYGNET.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L4xx/STM32L4x3.svd
 
 # Upload menu
@@ -12353,6 +13123,11 @@ Blues.menu.upload_method.swdMethod.upload.protocol=swd
 Blues.menu.upload_method.swdMethod.upload.options=
 Blues.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+Blues.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+Blues.menu.upload_method.jlinkMethod.upload.protocol=jlink
+Blues.menu.upload_method.jlinkMethod.upload.options=
+Blues.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 Blues.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 Blues.menu.upload_method.serialMethod.upload.protocol=serial
 Blues.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -12363,6 +13138,18 @@ Blues.menu.upload_method.dfuMethod.upload.protocol=dfu
 Blues.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 Blues.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+Blues.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+Blues.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+Blues.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+Blues.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+Blues.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+Blues.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+Blues.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+Blues.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+Blues.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # Elecgator boards
 
@@ -12390,7 +13177,7 @@ Elecgator.menu.pnum.ETHERCAT_DUINO.build.series=STM32F7xx
 Elecgator.menu.pnum.ETHERCAT_DUINO.build.product_line=STM32F746xx
 Elecgator.menu.pnum.ETHERCAT_DUINO.build.variant=STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)
 Elecgator.menu.pnum.ETHERCAT_DUINO.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Elecgator.menu.pnum.ETHERCAT_DUINO.debug.server.openocd.scripts.2=target/stm32f7x.cfg
+Elecgator.menu.pnum.ETHERCAT_DUINO.openocd.target=stm32f7x
 Elecgator.menu.pnum.ETHERCAT_DUINO.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F7xx/STM32F746.svd
 
 # Upload menu
@@ -12399,11 +13186,28 @@ Elecgator.menu.upload_method.swdMethod.upload.protocol=swd
 Elecgator.menu.upload_method.swdMethod.upload.options=
 Elecgator.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+Elecgator.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+Elecgator.menu.upload_method.jlinkMethod.upload.protocol=jlink
+Elecgator.menu.upload_method.jlinkMethod.upload.options=
+Elecgator.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 Elecgator.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
 Elecgator.menu.upload_method.dfuMethod.upload.protocol=dfu
 Elecgator.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 Elecgator.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+Elecgator.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+Elecgator.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+Elecgator.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+Elecgator.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+Elecgator.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+Elecgator.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+Elecgator.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+Elecgator.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+Elecgator.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # Electronic Speed Controller boards
 
@@ -12429,7 +13233,7 @@ ESC_board.menu.pnum.WRAITH32_V1.build.series=STM32F0xx
 ESC_board.menu.pnum.WRAITH32_V1.build.product_line=STM32F051x8
 ESC_board.menu.pnum.WRAITH32_V1.build.variant=STM32F0xx/F051K(6-8)U
 ESC_board.menu.pnum.WRAITH32_V1.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-ESC_board.menu.pnum.WRAITH32_V1.debug.server.openocd.scripts.2=target/stm32f0x.cfg
+ESC_board.menu.pnum.WRAITH32_V1.openocd.target=stm32f0x
 ESC_board.menu.pnum.WRAITH32_V1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x1.svd
 
 # STORM32_V1_RC board
@@ -12442,7 +13246,7 @@ ESC_board.menu.pnum.STORM32_V1_31_RC.build.series=STM32F1xx
 ESC_board.menu.pnum.STORM32_V1_31_RC.build.product_line=STM32F103xE
 ESC_board.menu.pnum.STORM32_V1_31_RC.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 ESC_board.menu.pnum.STORM32_V1_31_RC.build.variant=STM32F1xx/F103R(C-D-E)T
-ESC_board.menu.pnum.STORM32_V1_31_RC.debug.server.openocd.scripts.2=target/stm32f1x.cfg
+ESC_board.menu.pnum.STORM32_V1_31_RC.openocd.target=stm32f1x
 ESC_board.menu.pnum.STORM32_V1_31_RC.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F103.svd
 
 # Upload menu
@@ -12451,6 +13255,11 @@ ESC_board.menu.upload_method.swdMethod.upload.protocol=swd
 ESC_board.menu.upload_method.swdMethod.upload.options=
 ESC_board.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+ESC_board.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+ESC_board.menu.upload_method.jlinkMethod.upload.protocol=jlink
+ESC_board.menu.upload_method.jlinkMethod.upload.options=
+ESC_board.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 ESC_board.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 ESC_board.menu.upload_method.serialMethod.upload.protocol=serial
 ESC_board.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -12461,6 +13270,18 @@ ESC_board.menu.upload_method.dfuMethod.upload.protocol=dfu
 ESC_board.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 ESC_board.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+ESC_board.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+ESC_board.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+ESC_board.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+ESC_board.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+ESC_board.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+ESC_board.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+ESC_board.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+ESC_board.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+ESC_board.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # Garatronic-McHobby STM32 boards
 
@@ -12486,7 +13307,7 @@ Garatronic.menu.pnum.PYBSTICK26_DUINO.build.series=STM32F0xx
 Garatronic.menu.pnum.PYBSTICK26_DUINO.build.product_line=STM32F072xB
 Garatronic.menu.pnum.PYBSTICK26_DUINO.build.variant=STM32F0xx/F072R8T_F072RB(H-I-T)
 Garatronic.menu.pnum.PYBSTICK26_DUINO.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-Garatronic.menu.pnum.PYBSTICK26_DUINO.debug.server.openocd.scripts.2=target/stm32f0x.cfg
+Garatronic.menu.pnum.PYBSTICK26_DUINO.openocd.target=stm32f0x
 Garatronic.menu.pnum.PYBSTICK26_DUINO.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
 
 # PYBSTICK26(LITE) board with F401CE
@@ -12501,7 +13322,7 @@ Garatronic.menu.pnum.PYBSTICK26_LITE.build.variant=STM32F4xx/F401CC(F-U-Y)_F401C
 Garatronic.menu.pnum.PYBSTICK26_LITE.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 Garatronic.menu.pnum.PYBSTICK26_LITE.build.fpu=-mfpu=fpv4-sp-d16
 Garatronic.menu.pnum.PYBSTICK26_LITE.build.float-abi=-mfloat-abi=hard
-Garatronic.menu.pnum.PYBSTICK26_LITE.debug.server.openocd.scripts.2=target/stm32f4x.cfg
+Garatronic.menu.pnum.PYBSTICK26_LITE.openocd.target=stm32f4x
 Garatronic.menu.pnum.PYBSTICK26_LITE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F401.svd
 
 # PYBSTICK26(STD/Programmez!) board with F411RE
@@ -12516,7 +13337,7 @@ Garatronic.menu.pnum.PYBSTICK26_STD.build.variant=STM32F4xx/F411R(C-E)T
 Garatronic.menu.pnum.PYBSTICK26_STD.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 Garatronic.menu.pnum.PYBSTICK26_STD.build.fpu=-mfpu=fpv4-sp-d16
 Garatronic.menu.pnum.PYBSTICK26_STD.build.float-abi=-mfloat-abi=hard
-Garatronic.menu.pnum.PYBSTICK26_STD.debug.server.openocd.scripts.2=target/stm32f4x.cfg
+Garatronic.menu.pnum.PYBSTICK26_STD.openocd.target=stm32f4x
 Garatronic.menu.pnum.PYBSTICK26_STD.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F411.svd
 
 # PYBSTICK26(PRO) board with F412RE
@@ -12531,7 +13352,7 @@ Garatronic.menu.pnum.PYBSTICK26_PRO.build.variant=STM32F4xx/F412R(E-G)(T-Y)x(P)
 Garatronic.menu.pnum.PYBSTICK26_PRO.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 Garatronic.menu.pnum.PYBSTICK26_PRO.build.fpu=-mfpu=fpv4-sp-d16
 Garatronic.menu.pnum.PYBSTICK26_PRO.build.float-abi=-mfloat-abi=hard
-Garatronic.menu.pnum.PYBSTICK26_PRO.debug.server.openocd.scripts.2=target/stm32f4x.cfg
+Garatronic.menu.pnum.PYBSTICK26_PRO.openocd.target=stm32f4x
 Garatronic.menu.pnum.PYBSTICK26_PRO.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F412.svd
 
 # PYBSTICK26 boards upload method
@@ -12567,7 +13388,7 @@ GenFlight.menu.pnum.AFROFLIGHT_F103CB.build.variant=STM32F1xx/F103C8T_F103CB(T-U
 GenFlight.menu.pnum.AFROFLIGHT_F103CB.build.variant_h=variant_AFROFLIGHT_F103CB_XX.h
 GenFlight.menu.pnum.AFROFLIGHT_F103CB.upload.vid.0=0x1eaf
 GenFlight.menu.pnum.AFROFLIGHT_F103CB.upload.pid.0=0x0003
-GenFlight.menu.pnum.AFROFLIGHT_F103CB.debug.server.openocd.scripts.2=target/stm32f1x.cfg
+GenFlight.menu.pnum.AFROFLIGHT_F103CB.openocd.target=stm32f1x
 GenFlight.menu.pnum.AFROFLIGHT_F103CB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F103.svd
 
 GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M=Afro Flight Rev5 (12MHz)
@@ -12581,7 +13402,7 @@ GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M.build.variant=STM32F1xx/F103C8T_F103CB
 GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M.build.variant_h=variant_AFROFLIGHT_F103CB_XX.h
 GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M.upload.vid.0=0x1eaf
 GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M.upload.pid.0=0x0003
-GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M.debug.server.openocd.scripts.2=target/stm32f1x.cfg
+GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M.openocd.target=stm32f1x
 GenFlight.menu.pnum.AFROFLIGHT_F103CB_12M.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F1xx/STM32F103.svd
 
 # Sparky_V1 board
@@ -12596,7 +13417,7 @@ GenFlight.menu.pnum.Sparky_V1.build.fpu=-mfpu=fpv4-sp-d16
 GenFlight.menu.pnum.Sparky_V1.build.float-abi=-mfloat-abi=hard
 GenFlight.menu.pnum.Sparky_V1.build.variant=STM32F3xx/F303C(B-C)T
 GenFlight.menu.pnum.Sparky_V1.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-GenFlight.menu.pnum.Sparky_V1.debug.server.openocd.scripts.2=target/stm32f3x.cfg
+GenFlight.menu.pnum.Sparky_V1.openocd.target=stm32f3x
 GenFlight.menu.pnum.Sparky_V1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F3xx/STM32F303.svd
 
 # Upload menu
@@ -12605,6 +13426,11 @@ GenFlight.menu.upload_method.swdMethod.upload.protocol=swd
 GenFlight.menu.upload_method.swdMethod.upload.options=
 GenFlight.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+GenFlight.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+GenFlight.menu.upload_method.jlinkMethod.upload.protocol=jlink
+GenFlight.menu.upload_method.jlinkMethod.upload.options=
+GenFlight.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 GenFlight.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 GenFlight.menu.upload_method.serialMethod.upload.protocol=serial
 GenFlight.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -12639,6 +13465,14 @@ GenFlight.menu.upload_method.dfuoMethod.upload.altID=1
 GenFlight.menu.upload_method.dfuoMethod.build.flash_offset=0x5000
 GenFlight.menu.upload_method.dfuoMethod.build.bootloader_flags=-DBL_LEGACY_LEAF
 
+GenFlight.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+GenFlight.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+GenFlight.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+GenFlight.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+GenFlight.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+GenFlight.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # IoT continuum Boards
 
@@ -12664,7 +13498,7 @@ IotContinuum.menu.pnum.DEVKIT_IOT_CONTINUUM.build.series=STM32U5xx
 IotContinuum.menu.pnum.DEVKIT_IOT_CONTINUUM.build.product_line=STM32U585xx
 IotContinuum.menu.pnum.DEVKIT_IOT_CONTINUUM.build.variant=STM32U5xx/U575C(G-I)(T-U)_U585CI(T-U)
 IotContinuum.menu.pnum.DEVKIT_IOT_CONTINUUM.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-IotContinuum.menu.pnum.DEVKIT_IOT_CONTINUUM.debug.server.openocd.scripts.2=target/stm32u5x.cfg
+IotContinuum.menu.pnum.DEVKIT_IOT_CONTINUUM.openocd.target=stm32u5x
 IotContinuum.menu.pnum.DEVKIT_IOT_CONTINUUM.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32U5xx/STM32U585.svd
 
 # Upload menu
@@ -12673,6 +13507,11 @@ IotContinuum.menu.upload_method.swdMethod.upload.protocol=swd
 IotContinuum.menu.upload_method.swdMethod.upload.options=
 IotContinuum.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+IotContinuum.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+IotContinuum.menu.upload_method.jlinkMethod.upload.protocol=jlink
+IotContinuum.menu.upload_method.jlinkMethod.upload.options=
+IotContinuum.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 IotContinuum.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 IotContinuum.menu.upload_method.serialMethod.upload.protocol=serial
 IotContinuum.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -12683,6 +13522,18 @@ IotContinuum.menu.upload_method.dfuMethod.upload.protocol=dfu
 IotContinuum.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 IotContinuum.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+IotContinuum.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+IotContinuum.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+IotContinuum.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+IotContinuum.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+IotContinuum.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+IotContinuum.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+IotContinuum.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+IotContinuum.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+IotContinuum.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # LoRa boards
 
@@ -12708,7 +13559,7 @@ LoRa.menu.pnum.ACSIP_S76S.build.product_line=STM32L073xx
 LoRa.menu.pnum.ACSIP_S76S.build.variant=STM32L0xx/L072R(B-Z)T_L073R(B-Z)T_L083R(B-Z)T
 LoRa.menu.pnum.ACSIP_S76S.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 LoRa.menu.pnum.ACSIP_S76S.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-LoRa.menu.pnum.ACSIP_S76S.debug.server.openocd.scripts.2=target/stm32l0x.cfg
+LoRa.menu.pnum.ACSIP_S76S.openocd.target=stm32l0
 LoRa.menu.pnum.ACSIP_S76S.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L0xx/STM32L0x3.svd
 
 # Generic node SE by The Things Industries
@@ -12722,7 +13573,7 @@ LoRa.menu.pnum.GENERIC_NODE_SE_TTI.build.product_line=STM32WL55xx
 LoRa.menu.pnum.GENERIC_NODE_SE_TTI.build.variant=STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U
 LoRa.menu.pnum.GENERIC_NODE_SE_TTI.build.variant_h=variant_GENERIC_NODE_SE_TTI.h
 LoRa.menu.pnum.GENERIC_NODE_SE_TTI.build.st_extra_flags=-D{build.product_line} -DUSE_CM4_STARTUP_FILE {build.xSerial}
-LoRa.menu.pnum.GENERIC_NODE_SE_TTI.debug.server.openocd.scripts.2=target/stm32wlx.cfg
+LoRa.menu.pnum.GENERIC_NODE_SE_TTI.openocd.target=stm32wlx
 LoRa.menu.pnum.GENERIC_NODE_SE_TTI.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WLxx/STM32WL5x_CM4.svd
 
 # LORA_E5_MINI board
@@ -12736,7 +13587,7 @@ LoRa.menu.pnum.LORA_E5_MINI.build.product_line=STM32WLE5xx
 LoRa.menu.pnum.LORA_E5_MINI.build.variant=STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I
 LoRa.menu.pnum.LORA_E5_MINI.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 LoRa.menu.pnum.LORA_E5_MINI.build.variant_h=variant_LORA_E5_MINI.h
-LoRa.menu.pnum.LORA_E5_MINI.debug.server.openocd.scripts.2=target/stm32wlx.cfg
+LoRa.menu.pnum.LORA_E5_MINI.openocd.target=stm32wlx
 LoRa.menu.pnum.LORA_E5_MINI.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WLxx/STM32WLE5_CM4.svd
 
 # RAK3172 module
@@ -12749,7 +13600,7 @@ LoRa.menu.pnum.RAK3172_MODULE.build.series=STM32WLxx
 LoRa.menu.pnum.RAK3172_MODULE.build.product_line=STM32WLE5xx
 LoRa.menu.pnum.RAK3172_MODULE.build.variant=STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U
 LoRa.menu.pnum.RAK3172_MODULE.build.variant_h=variant_RAK3172_MODULE.h
-LoRa.menu.pnum.RAK3172_MODULE.debug.server.openocd.scripts.2=target/stm32wlx.cfg
+LoRa.menu.pnum.RAK3172_MODULE.openocd.target=stm32wlx
 LoRa.menu.pnum.RAK3172_MODULE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WLxx/STM32WLE5_CM4.svd
 
 # RAK3172T module
@@ -12762,7 +13613,7 @@ LoRa.menu.pnum.RAK3172T_MODULE.build.series=STM32WLxx
 LoRa.menu.pnum.RAK3172T_MODULE.build.product_line=STM32WLE5xx
 LoRa.menu.pnum.RAK3172T_MODULE.build.variant=STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U
 LoRa.menu.pnum.RAK3172T_MODULE.build.variant_h=variant_RAK3172_MODULE.h
-LoRa.menu.pnum.RAK3172T_MODULE.debug.server.openocd.scripts.2=target/stm32wlx.cfg
+LoRa.menu.pnum.RAK3172T_MODULE.openocd.target=stm32wlx
 LoRa.menu.pnum.RAK3172T_MODULE.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WLxx/STM32WLE5_CM4.svd
 
 # RAK811_TRACKER board
@@ -12775,7 +13626,7 @@ LoRa.menu.pnum.RAK811_TRACKER.build.series=STM32L1xx
 LoRa.menu.pnum.RAK811_TRACKER.build.product_line=STM32L151xB
 LoRa.menu.pnum.RAK811_TRACKER.build.variant=STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)
 LoRa.menu.pnum.RAK811_TRACKER.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-LoRa.menu.pnum.RAK811_TRACKER.debug.server.openocd.scripts.2=target/stm32l1x.cfg
+LoRa.menu.pnum.RAK811_TRACKER.openocd.target=stm32l1
 LoRa.menu.pnum.RAK811_TRACKER.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L1xx/STM32L151.svd
 
 LoRa.menu.pnum.RAK811_TRACKERA=RAK811 LoRa Tracker (32kb RAM)
@@ -12788,7 +13639,7 @@ LoRa.menu.pnum.RAK811_TRACKERA.build.product_line=STM32L151xBA
 LoRa.menu.pnum.RAK811_TRACKERA.build.variant=STM32L1xx/L100C6Ux(A)_L151C(6-8-B)(T-U)x(A)_L152C(6-8-B)(T-U)x(A)
 LoRa.menu.pnum.RAK811_TRACKERA.build.variant_h=variant_RAK811_TRACKER.h
 LoRa.menu.pnum.RAK811_TRACKERA.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
-LoRa.menu.pnum.RAK811_TRACKERA.debug.server.openocd.scripts.2=target/stm32l1x.cfg
+LoRa.menu.pnum.RAK811_TRACKERA.openocd.target=stm32l1
 
 # RHF76_052 board
 LoRa.menu.pnum.RHF76_052=RHF76 052
@@ -12801,7 +13652,7 @@ LoRa.menu.pnum.RHF76_052.build.product_line=STM32L051xx
 LoRa.menu.pnum.RHF76_052.build.variant=STM32L0xx/L051C(6-8)(T-U)
 LoRa.menu.pnum.RHF76_052.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 LoRa.menu.pnum.RHF76_052.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
-LoRa.menu.pnum.RHF76_052.debug.server.openocd.scripts.2=target/stm32l0x.cfg
+LoRa.menu.pnum.RHF76_052.openocd.target=stm32l0
 LoRa.menu.pnum.RHF76_052.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32L0xx/STM32L0x1.svd
 
 # ELEKTOR_F072C8
@@ -12816,7 +13667,7 @@ LoRa.menu.pnum.ELEKTOR_F072C8.build.variant=STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)
 LoRa.menu.pnum.ELEKTOR_F072C8.build.variant_h=variant_ELEKTOR_F072Cx.h
 LoRa.menu.pnum.ELEKTOR_F072C8.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 LoRa.menu.pnum.ELEKTOR_F072C8.build.st_extra_flags=-D{build.product_line} {build.xSerial}
-LoRa.menu.pnum.ELEKTOR_F072C8.debug.server.openocd.scripts.2=target/stm32f0x.cfg
+LoRa.menu.pnum.ELEKTOR_F072C8.openocd.target=stm32f0x
 LoRa.menu.pnum.ELEKTOR_F072C8.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
 
 # ELEKTOR_F072CB
@@ -12831,7 +13682,7 @@ LoRa.menu.pnum.ELEKTOR_F072CB.build.variant=STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)
 LoRa.menu.pnum.ELEKTOR_F072CB.build.variant_h=variant_ELEKTOR_F072Cx.h
 LoRa.menu.pnum.ELEKTOR_F072CB.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 LoRa.menu.pnum.ELEKTOR_F072CB.build.st_extra_flags=-D{build.product_line} {build.xSerial}
-LoRa.menu.pnum.ELEKTOR_F072CB.debug.server.openocd.scripts.2=target/stm32f0x.cfg
+LoRa.menu.pnum.ELEKTOR_F072CB.openocd.target=stm32f0x
 LoRa.menu.pnum.ELEKTOR_F072CB.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
 
 # Upload menu
@@ -12840,6 +13691,11 @@ LoRa.menu.upload_method.swdMethod.upload.protocol=swd
 LoRa.menu.upload_method.swdMethod.upload.options=
 LoRa.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+LoRa.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+LoRa.menu.upload_method.jlinkMethod.upload.protocol=jlink
+LoRa.menu.upload_method.jlinkMethod.upload.options=
+LoRa.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 LoRa.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 LoRa.menu.upload_method.serialMethod.upload.protocol=serial
 LoRa.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -12850,6 +13706,18 @@ LoRa.menu.upload_method.dfuMethod.upload.protocol=dfu
 LoRa.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 LoRa.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+LoRa.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+LoRa.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+LoRa.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+LoRa.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+LoRa.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+LoRa.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+LoRa.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+LoRa.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+LoRa.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # Midatronics boards
 
@@ -12877,7 +13745,7 @@ Midatronics.menu.pnum.MKR_SHARKY.build.board=MKR_SHARKY
 Midatronics.menu.pnum.MKR_SHARKY.build.series=STM32WBxx
 Midatronics.menu.pnum.MKR_SHARKY.build.product_line=STM32WB55xx
 Midatronics.menu.pnum.MKR_SHARKY.build.variant=STM32WBxx/WB35C(C-E)UxA_WB55C(C-E-G)U
-Midatronics.menu.pnum.MKR_SHARKY.debug.server.openocd.scripts.2=target/stm32wbx.cfg
+Midatronics.menu.pnum.MKR_SHARKY.openocd.target=stm32wbx
 Midatronics.menu.pnum.MKR_SHARKY.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WBxx/STM32WB55_CM4.svd
 
 # Upload menu
@@ -12890,6 +13758,11 @@ Midatronics.menu.upload_method.swdMethod.upload.protocol=swd
 Midatronics.menu.upload_method.swdMethod.upload.options=
 Midatronics.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+Midatronics.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+Midatronics.menu.upload_method.jlinkMethod.upload.protocol=jlink
+Midatronics.menu.upload_method.jlinkMethod.upload.options=
+Midatronics.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 Midatronics.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 Midatronics.menu.upload_method.serialMethod.upload.protocol=serial
 Midatronics.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -12900,6 +13773,18 @@ Midatronics.menu.upload_method.dfuMethod.upload.protocol=dfu
 Midatronics.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 Midatronics.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+Midatronics.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+Midatronics.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+Midatronics.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+Midatronics.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+Midatronics.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+Midatronics.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+Midatronics.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+Midatronics.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+Midatronics.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # SparkFun Boards
 
@@ -12929,7 +13814,7 @@ SparkFun.menu.pnum.SFE_MMPB_STM32WB5MMG.build.variant=STM32WBxx/WB5MMGH
 SparkFun.menu.pnum.SFE_MMPB_STM32WB5MMG.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 SparkFun.menu.pnum.SFE_MMPB_STM32WB5MMG.vid.0=0x1B4F
 SparkFun.menu.pnum.SFE_MMPB_STM32WB5MMG.pid.0=0x0034
-SparkFun.menu.pnum.SFE_MMPB_STM32WB5MMG.debug.server.openocd.scripts.2=target/stm32wbx.cfg
+SparkFun.menu.pnum.SFE_MMPB_STM32WB5MMG.openocd.target=stm32wbx
 SparkFun.menu.pnum.SFE_MMPB_STM32WB5MMG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WBxx/STM32WB55_CM4.svd
 
 # SparkFun MicroMod STM32F405 Board
@@ -12947,7 +13832,7 @@ SparkFun.menu.pnum.MICROMOD_F405.build.variant=STM32F4xx/F405RGT_F415RGT
 SparkFun.menu.pnum.MICROMOD_F405.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 SparkFun.menu.pnum.MICROMOD_F405.vid.0=0x1B4F
 SparkFun.menu.pnum.MICROMOD_F405.pid.0=0x0029
-SparkFun.menu.pnum.MICROMOD_F405.debug.server.openocd.scripts.2=target/stm32f4x.cfg
+SparkFun.menu.pnum.MICROMOD_F405.openocd.target=stm32f4x
 SparkFun.menu.pnum.MICROMOD_F405.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F4xx/STM32F405.svd
 
 # Upload menu
@@ -12956,6 +13841,11 @@ SparkFun.menu.upload_method.swdMethod.upload.protocol=swd
 SparkFun.menu.upload_method.swdMethod.upload.options=
 SparkFun.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+SparkFun.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link)
+SparkFun.menu.upload_method.jlinkMethod.upload.protocol=jlink
+SparkFun.menu.upload_method.jlinkMethod.upload.options=
+SparkFun.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 SparkFun.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
 SparkFun.menu.upload_method.serialMethod.upload.protocol=serial
 SparkFun.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
@@ -12966,6 +13856,18 @@ SparkFun.menu.upload_method.dfuMethod.upload.protocol=dfu
 SparkFun.menu.upload_method.dfuMethod.upload.options=-v {upload.vid} -p {upload.pid}
 SparkFun.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 
+SparkFun.menu.upload_method.bmpMethod=BMP (Black Magic Probe)
+SparkFun.menu.upload_method.bmpMethod.upload.protocol=gdb_bmp
+SparkFun.menu.upload_method.bmpMethod.upload.tool=bmp_upload
+
+SparkFun.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+SparkFun.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+SparkFun.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
+SparkFun.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+SparkFun.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+SparkFun.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
 ################################################################################
 # ELV Modular System boards
 
@@ -12988,7 +13890,7 @@ ELV_Modular_System.menu.pnum.ELV_BM_TRX1.build.variant=STM32WLxx/WL54JCI_WL55JCI
 ELV_Modular_System.menu.pnum.ELV_BM_TRX1.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
 ELV_Modular_System.menu.pnum.ELV_BM_TRX1.build.flash_offset=0x800
 ELV_Modular_System.menu.pnum.ELV_BM_TRX1.build.st_extra_flags=-D{build.product_line} -DUSE_CM4_STARTUP_FILE {build.xSerial}
-ELV_Modular_System.menu.pnum.ELV_BM_TRX1.debug.server.openocd.scripts.2=target/stm32wlx.cfg
+ELV_Modular_System.menu.pnum.ELV_BM_TRX1.openocd.target=stm32wlx
 ELV_Modular_System.menu.pnum.ELV_BM_TRX1.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WLxx/STM32WLE5_CM4.svd
 
 # Upload menu
@@ -12997,11 +13899,58 @@ ELV_Modular_System.menu.upload_method.swdMethod.upload.protocol=swd
 ELV_Modular_System.menu.upload_method.swdMethod.upload.options=
 ELV_Modular_System.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
 
+ELV_Modular_System.menu.upload_method.jlinkMethod=STM32CubeProgrammer (J-Link) with Bootloader
+ELV_Modular_System.menu.upload_method.jlinkMethod.upload.protocol=jlink
+ELV_Modular_System.menu.upload_method.jlinkMethod.upload.options=
+ELV_Modular_System.menu.upload_method.jlinkMethod.upload.tool=stm32CubeProg
+
 ELV_Modular_System.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial) with Bootloader
 ELV_Modular_System.menu.upload_method.serialMethod.upload.protocol=serial
 ELV_Modular_System.menu.upload_method.serialMethod.upload.options=-c {serial.port.file}
 ELV_Modular_System.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
 
+################################################################################
+# STeaMi board
+STeaMi.name=STeaMi Board
+STeaMi.build.core=arduino
+STeaMi.build.board=STeaMi
+STeaMi.build.variant_h=variant_{build.board}.h
+STeaMi.build.st_extra_flags=-D{build.product_line} {build.xSerial}
+STeaMi.build.flash_offset=0x0
+STeaMi.upload.maximum_size=0
+STeaMi.upload.maximum_data_size=0
+STeaMi.vid.0=0x0d28
+STeaMi.pid.0=0x0204
+
+STeaMi.menu.pnum.STEAM32_WB55RG=STeaMi
+STeaMi.menu.pnum.STEAM32_WB55RG.node="STeaMi,DAPLINK"
+STeaMi.menu.pnum.STEAM32_WB55RG.upload.maximum_size=524288
+STeaMi.menu.pnum.STEAM32_WB55RG.upload.maximum_data_size=196608
+STeaMi.menu.pnum.STEAM32_WB55RG.build.mcu=cortex-m4
+STeaMi.menu.pnum.STEAM32_WB55RG.build.fpu=-mfpu=fpv4-sp-d16
+STeaMi.menu.pnum.STEAM32_WB55RG.build.float-abi=-mfloat-abi=hard
+STeaMi.menu.pnum.STEAM32_WB55RG.build.board=STEAM32_WB55RG
+STeaMi.menu.pnum.STEAM32_WB55RG.build.series=STM32WBxx
+STeaMi.menu.pnum.STEAM32_WB55RG.build.product_line=STM32WB55xx
+STeaMi.menu.pnum.STEAM32_WB55RG.build.variant=STM32WBxx/WB55R(C-E-G)V
+STeaMi.menu.pnum.STEAM32_WB55RG.debug.server.openocd.scripts.0=interface/cmsis-dap.cfg
+STeaMi.menu.pnum.STEAM32_WB55RG.debug.server.openocd.scripts.1={runtime.platform.path}/debugger/select_swd.cfg
+STeaMi.menu.pnum.STEAM32_WB55RG.openocd.target=stm32wbx
+STeaMi.menu.pnum.STEAM32_WB55RG.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32WBxx/STM32WB55_CM4.svd
+
+# Upload menu
+STeaMi.menu.upload_method.MassStorage=Mass Storage
+STeaMi.menu.upload_method.MassStorage.upload.protocol=
+STeaMi.menu.upload_method.MassStorage.upload.tool=massStorageCopy
+
+STeaMi.menu.upload_method.OpenOCDDapLink=OpenOCD DapLink (SWD)
+STeaMi.menu.upload_method.OpenOCDDapLink.upload.protocol=cmsis-dap
+STeaMi.menu.upload_method.OpenOCDDapLink.upload.tool=openocd_upload
+
+STeaMi.menu.upload_method.OpenOCDSTLink=OpenOCD STLink (SWD)
+STeaMi.menu.upload_method.OpenOCDSTLink.upload.protocol=stlink
+STeaMi.menu.upload_method.OpenOCDSTLink.upload.tool=openocd_upload
+
 ################################################################################
 # Serialx activation
 Nucleo_144.menu.xserial.generic=Enabled (generic 'Serial')
@@ -13138,6 +14087,12 @@ GenL5.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
 GenL5.menu.xserial.disabled=Disabled (no Serial support)
 GenL5.menu.xserial.disabled.build.xSerial=
 
+GenU0.menu.xserial.generic=Enabled (generic 'Serial')
+GenU0.menu.xserial.none=Enabled (no generic 'Serial')
+GenU0.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
+GenU0.menu.xserial.disabled=Disabled (no Serial support)
+GenU0.menu.xserial.disabled.build.xSerial=
+
 GenU5.menu.xserial.generic=Enabled (generic 'Serial')
 GenU5.menu.xserial.none=Enabled (no generic 'Serial')
 GenU5.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
@@ -13228,6 +14183,12 @@ ELV_Modular_System.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DH
 ELV_Modular_System.menu.xserial.disabled=Disabled (no Serial support)
 ELV_Modular_System.menu.xserial.disabled.build.xSerial=
 
+STeaMi.menu.xserial.generic=Enabled (generic 'Serial')
+STeaMi.menu.xserial.none=Enabled (no generic 'Serial')
+STeaMi.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
+STeaMi.menu.xserial.disabled=Disabled (no Serial support)
+STeaMi.menu.xserial.disabled.build.xSerial=
+
 # USB connectivity
 Nucleo_144.menu.usb.none=None
 Nucleo_144.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
@@ -13294,6 +14255,14 @@ Eval.menu.xusb.HS.build.usb_speed=-DUSE_USB_HS
 Eval.menu.xusb.HSFS=High Speed in Full Speed mode
 Eval.menu.xusb.HSFS.build.usb_speed=-DUSE_USB_HS -DUSE_USB_HS_IN_FS
 
+GenC0.menu.usb.none=None
+GenC0.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
+GenC0.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
+GenC0.menu.usb.CDC=CDC (no generic 'Serial')
+GenC0.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB
+GenC0.menu.usb.HID=HID (keyboard and mouse)
+GenC0.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
+
 GenF0.menu.usb.none=None
 GenF0.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
 GenF0.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
@@ -13367,6 +14336,14 @@ GenF7.menu.xusb.HS.build.usb_speed=-DUSE_USB_HS
 GenF7.menu.xusb.HSFS=High Speed in Full Speed mode
 GenF7.menu.xusb.HSFS.build.usb_speed=-DUSE_USB_HS -DUSE_USB_HS_IN_FS
 
+GenG0.menu.usb.none=None
+GenG0.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
+GenG0.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
+GenG0.menu.usb.CDC=CDC (no generic 'Serial')
+GenG0.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB
+GenG0.menu.usb.HID=HID (keyboard and mouse)
+GenG0.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
+
 GenG4.menu.usb.none=None
 GenG4.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
 GenG4.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
@@ -13380,14 +14357,6 @@ GenG4.menu.xusb.HS.build.usb_speed=-DUSE_USB_HS
 GenG4.menu.xusb.HSFS=High Speed in Full Speed mode
 GenG4.menu.xusb.HSFS.build.usb_speed=-DUSE_USB_HS -DUSE_USB_HS_IN_FS
 
-GenG0.menu.usb.none=None
-GenG0.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
-GenG0.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
-GenG0.menu.usb.CDC=CDC (no generic 'Serial')
-GenG0.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB
-GenG0.menu.usb.HID=HID (keyboard and mouse)
-GenG0.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
-
 GenH5.menu.usb.none=None
 GenH5.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
 GenH5.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
@@ -13456,6 +14425,14 @@ GenL5.menu.xusb.HS.build.usb_speed=-DUSE_USB_HS
 GenL5.menu.xusb.HSFS=High Speed in Full Speed mode
 GenL5.menu.xusb.HSFS.build.usb_speed=-DUSE_USB_HS -DUSE_USB_HS_IN_FS
 
+GenU0.menu.usb.none=None
+GenU0.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
+GenU0.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
+GenU0.menu.usb.CDC=CDC (no generic 'Serial')
+GenU0.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB
+GenU0.menu.usb.HID=HID (keyboard and mouse)
+GenU0.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
+
 GenU5.menu.usb.none=None
 GenU5.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
 GenU5.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
@@ -13997,6 +14974,27 @@ GenL5.menu.opt.ogstd.build.flags.optimize=-Og
 GenL5.menu.opt.o0std=No Optimization (-O0)
 GenL5.menu.opt.o0std.build.flags.optimize=-O0
 
+GenU0.menu.opt.osstd=Smallest (-Os default)
+GenU0.menu.opt.osstd.build.flags.optimize=-Os
+GenU0.menu.opt.oslto=Smallest (-Os) with LTO
+GenU0.menu.opt.oslto.build.flags.optimize=-Os -flto
+GenU0.menu.opt.o1std=Fast (-O1)
+GenU0.menu.opt.o1std.build.flags.optimize=-O1
+GenU0.menu.opt.o1lto=Fast (-O1) with LTO
+GenU0.menu.opt.o1lto.build.flags.optimize=-O1 -flto
+GenU0.menu.opt.o2std=Faster (-O2)
+GenU0.menu.opt.o2std.build.flags.optimize=-O2
+GenU0.menu.opt.o2lto=Faster (-O2) with LTO
+GenU0.menu.opt.o2lto.build.flags.optimize=-O2 -flto
+GenU0.menu.opt.o3std=Fastest (-O3)
+GenU0.menu.opt.o3std.build.flags.optimize=-O3
+GenU0.menu.opt.o3lto=Fastest (-O3) with LTO
+GenU0.menu.opt.o3lto.build.flags.optimize=-O3 -flto
+GenU0.menu.opt.ogstd=Debug (-Og)
+GenU0.menu.opt.ogstd.build.flags.optimize=-Og
+GenU0.menu.opt.o0std=No Optimization (-O0)
+GenU0.menu.opt.o0std.build.flags.optimize=-O0
+
 GenU5.menu.opt.osstd=Smallest (-Os default)
 GenU5.menu.opt.osstd.build.flags.optimize=-Os
 GenU5.menu.opt.oslto=Smallest (-Os) with LTO
@@ -14298,6 +15296,26 @@ ELV_Modular_System.menu.opt.ogstd.build.flags.optimize=-Og
 ELV_Modular_System.menu.opt.o0std=No Optimization (-O0)
 ELV_Modular_System.menu.opt.o0std.build.flags.optimize=-O0
 
+STeaMi.menu.opt.osstd=Smallest (-Os default)
+STeaMi.menu.opt.oslto=Smallest (-Os) with LTO
+STeaMi.menu.opt.oslto.build.flags.optimize=-Os -flto
+STeaMi.menu.opt.o1std=Fast (-O1)
+STeaMi.menu.opt.o1std.build.flags.optimize=-O1
+STeaMi.menu.opt.o1lto=Fast (-O1) with LTO
+STeaMi.menu.opt.o1lto.build.flags.optimize=-O1 -flto
+STeaMi.menu.opt.o2std=Faster (-O2)
+STeaMi.menu.opt.o2std.build.flags.optimize=-O2
+STeaMi.menu.opt.o2lto=Faster (-O2) with LTO
+STeaMi.menu.opt.o2lto.build.flags.optimize=-O2 -flto
+STeaMi.menu.opt.o3std=Fastest (-O3)
+STeaMi.menu.opt.o3std.build.flags.optimize=-O3
+STeaMi.menu.opt.o3lto=Fastest (-O3) with LTO
+STeaMi.menu.opt.o3lto.build.flags.optimize=-O3 -flto
+STeaMi.menu.opt.ogstd=Debug (-Og)
+STeaMi.menu.opt.ogstd.build.flags.optimize=-Og
+STeaMi.menu.opt.o0std=No Optimization (-O0)
+STeaMi.menu.opt.o0std.build.flags.optimize=-O0
+
 # Debug information
 Nucleo_144.menu.dbg.none=None
 Nucleo_144.menu.dbg.enable_sym=Symbols Enabled (-g)
@@ -14463,6 +15481,22 @@ GenL5.menu.dbg.enable_log.build.flags.debug=
 GenL5.menu.dbg.enable_all=Core Logs and Symbols Enabled (-g)
 GenL5.menu.dbg.enable_all.build.flags.debug=-g
 
+GenU0.menu.dbg.none=None
+GenU0.menu.dbg.enable_sym=Symbols Enabled (-g)
+GenU0.menu.dbg.enable_sym.build.flags.debug=-g -DNDEBUG
+GenU0.menu.dbg.enable_log=Core logs Enabled
+GenU0.menu.dbg.enable_log.build.flags.debug=
+GenU0.menu.dbg.enable_all=Core Logs and Symbols Enabled (-g)
+GenU0.menu.dbg.enable_all.build.flags.debug=-g
+
+GenU5.menu.dbg.none=None
+GenU5.menu.dbg.enable_sym=Symbols Enabled (-g)
+GenU5.menu.dbg.enable_sym.build.flags.debug=-g -DNDEBUG
+GenU5.menu.dbg.enable_log=Core logs Enabled
+GenU5.menu.dbg.enable_log.build.flags.debug=
+GenU5.menu.dbg.enable_all=Core Logs and Symbols Enabled (-g)
+GenU5.menu.dbg.enable_all.build.flags.debug=-g
+
 GenWB.menu.dbg.none=None
 GenWB.menu.dbg.enable_sym=Symbols Enabled (-g)
 GenWB.menu.dbg.enable_sym.build.flags.debug=-g -DNDEBUG
@@ -14575,6 +15609,14 @@ ELV_Modular_System.menu.dbg.enable_log.build.flags.debug=
 ELV_Modular_System.menu.dbg.enable_all=Core Logs and Symbols Enabled (-g)
 ELV_Modular_System.menu.dbg.enable_all.build.flags.debug=-g
 
+STeaMi.menu.dbg.none=None
+STeaMi.menu.dbg.enable_sym=Symbols Enabled (-g)
+STeaMi.menu.dbg.enable_sym.build.flags.debug=-g -DNDEBUG
+STeaMi.menu.dbg.enable_log=Core logs Enabled
+STeaMi.menu.dbg.enable_log.build.flags.debug=
+STeaMi.menu.dbg.enable_all=Core Logs and Symbols Enabled (-g)
+STeaMi.menu.dbg.enable_all.build.flags.debug=-g
+
 # C Runtime Library
 Nucleo_144.menu.rtlib.nano=Newlib Nano (default)
 Nucleo_144.menu.rtlib.nanofp=Newlib Nano + Float Printf
@@ -14786,6 +15828,16 @@ GenL5.menu.rtlib.nanofps.build.flags.ldspecs=--specs=nano.specs -u _printf_float
 GenL5.menu.rtlib.full=Newlib Standard
 GenL5.menu.rtlib.full.build.flags.ldspecs=
 
+GenU0.menu.rtlib.nano=Newlib Nano (default)
+GenU0.menu.rtlib.nanofp=Newlib Nano + Float Printf
+GenU0.menu.rtlib.nanofp.build.flags.ldspecs=--specs=nano.specs -u _printf_float
+GenU0.menu.rtlib.nanofs=Newlib Nano + Float Scanf
+GenU0.menu.rtlib.nanofs.build.flags.ldspecs=--specs=nano.specs -u _scanf_float
+GenU0.menu.rtlib.nanofps=Newlib Nano + Float Printf/Scanf
+GenU0.menu.rtlib.nanofps.build.flags.ldspecs=--specs=nano.specs -u _printf_float -u _scanf_float
+GenU0.menu.rtlib.full=Newlib Standard
+GenU0.menu.rtlib.full.build.flags.ldspecs=
+
 GenU5.menu.rtlib.nano=Newlib Nano (default)
 GenU5.menu.rtlib.nanofp=Newlib Nano + Float Printf
 GenU5.menu.rtlib.nanofp.build.flags.ldspecs=--specs=nano.specs -u _printf_float
@@ -14935,3 +15987,13 @@ ELV_Modular_System.menu.rtlib.nanofps=Newlib Nano + Float Printf/Scanf
 ELV_Modular_System.menu.rtlib.nanofps.build.flags.ldspecs=--specs=nano.specs -u _printf_float -u _scanf_float
 ELV_Modular_System.menu.rtlib.full=Newlib Standard
 ELV_Modular_System.menu.rtlib.full.build.flags.ldspecs=
+
+STeaMi.menu.rtlib.nano=Newlib Nano (default)
+STeaMi.menu.rtlib.nanofp=Newlib Nano + Float Printf
+STeaMi.menu.rtlib.nanofp.build.flags.ldspecs=--specs=nano.specs -u _printf_float
+STeaMi.menu.rtlib.nanofs=Newlib Nano + Float Scanf
+STeaMi.menu.rtlib.nanofs.build.flags.ldspecs=--specs=nano.specs -u _scanf_float
+STeaMi.menu.rtlib.nanofps=Newlib Nano + Float Printf/Scanf
+STeaMi.menu.rtlib.nanofps.build.flags.ldspecs=--specs=nano.specs -u _printf_float -u _scanf_float
+STeaMi.menu.rtlib.full=Newlib Standard
+STeaMi.menu.rtlib.full.build.flags.ldspecs=

From 73f18fc3da47e8def651d75cde6b4141e4e4cf3f Mon Sep 17 00:00:00 2001
From: jackb60 <40903548+jackb60@users.noreply.github.com>
Date: Sun, 2 Feb 2025 20:06:13 -0500
Subject: [PATCH 05/10] Update README.md

Signed-off-by: jackb60 <40903548+jackb60@users.noreply.github.com>
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 36dab505d7..4c022fea11 100644
--- a/README.md
+++ b/README.md
@@ -242,6 +242,7 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
 | :green_heart:  | STM32F042F4<br>STM32F042F6 | Generic Board | *2.4.0* |  |
 | :green_heart:  | STM32F042G4<br>STM32F042G6 | Generic Board | *2.4.0* |  |
 | :green_heart: | STM32F042K4T<br>STM32F042K6T | Generic Board | **2.0.1** |  |
+| :yellow_heart: | STM32F042K6U | Generic Board | **2.10.0** |  |
 | :green_heart:  | STM32F042T6 | Generic Board | *2.4.0* |  |
 | :green_heart:  | STM32F048G6 | Generic Board | *2.4.0* |  |
 | :green_heart:  | STM32F048T6 | Generic Board | *2.4.0* |  |

From b43617f26d81da4fac5f48979d0a99afcbee8734 Mon Sep 17 00:00:00 2001
From: jackb60 <40903548+jackb60@users.noreply.github.com>
Date: Sun, 2 Feb 2025 20:08:41 -0500
Subject: [PATCH 06/10] Update README.md

Signed-off-by: jackb60 <40903548+jackb60@users.noreply.github.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4c022fea11..a0cfffd4a3 100644
--- a/README.md
+++ b/README.md
@@ -242,7 +242,7 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
 | :green_heart:  | STM32F042F4<br>STM32F042F6 | Generic Board | *2.4.0* |  |
 | :green_heart:  | STM32F042G4<br>STM32F042G6 | Generic Board | *2.4.0* |  |
 | :green_heart: | STM32F042K4T<br>STM32F042K6T | Generic Board | **2.0.1** |  |
-| :yellow_heart: | STM32F042K6U | Generic Board | **2.10.0** |  |
+| :yellow_heart: | STM32F042K4U<br>STM32F042K6U | Generic Board | **2.10.0** |  |
 | :green_heart:  | STM32F042T6 | Generic Board | *2.4.0* |  |
 | :green_heart:  | STM32F048G6 | Generic Board | *2.4.0* |  |
 | :green_heart:  | STM32F048T6 | Generic Board | *2.4.0* |  |

From 68c5cbe06fb45bfa87cc2f5eba97d4b401d28d35 Mon Sep 17 00:00:00 2001
From: jackb60 <40903548+jackb60@users.noreply.github.com>
Date: Sun, 2 Feb 2025 20:10:25 -0500
Subject: [PATCH 07/10] Update boards.txt

Signed-off-by: jackb60 <40903548+jackb60@users.noreply.github.com>
---
 boards.txt | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/boards.txt b/boards.txt
index 189a8cac84..f08631d400 100644
--- a/boards.txt
+++ b/boards.txt
@@ -2073,15 +2073,6 @@ GenF0.menu.pnum.GENERIC_F042K4TX.build.product_line=STM32F042x6
 GenF0.menu.pnum.GENERIC_F042K4TX.build.variant=STM32F0xx/F042K(4-6)T
 GenF0.menu.pnum.GENERIC_F042K4TX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
 
-# Generic F042K6Ux
-GenF0.menu.pnum.GENERIC_F042K6UX=Generic F042K6Ux
-GenF0.menu.pnum.GENERIC_F042K6UX.upload.maximum_size=32768
-GenF0.menu.pnum.GENERIC_F042K6UX.upload.maximum_data_size=6144
-GenF0.menu.pnum.GENERIC_F042K6UX.build.board=GENERIC_F042K6UX
-GenF0.menu.pnum.GENERIC_F042K6UX.build.product_line=STM32F042x6
-GenF0.menu.pnum.GENERIC_F042K6UX.build.variant=STM32F0xx/F042K(4-6)U
-GenF0.menu.pnum.GENERIC_F042K6UX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
-
 # Generic F042K6Tx
 GenF0.menu.pnum.GENERIC_F042K6TX=Generic F042K6Tx
 GenF0.menu.pnum.GENERIC_F042K6TX.upload.maximum_size=32768
@@ -2091,6 +2082,24 @@ GenF0.menu.pnum.GENERIC_F042K6TX.build.product_line=STM32F042x6
 GenF0.menu.pnum.GENERIC_F042K6TX.build.variant=STM32F0xx/F042K(4-6)T
 GenF0.menu.pnum.GENERIC_F042K6TX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
 
+# Generic F042K4Ux
+GenF0.menu.pnum.GENERIC_F042K4UX=Generic F042K4Ux
+GenF0.menu.pnum.GENERIC_F042K4UX.upload.maximum_size=16384
+GenF0.menu.pnum.GENERIC_F042K4UX.upload.maximum_data_size=6144
+GenF0.menu.pnum.GENERIC_F042K4UX.build.board=GENERIC_F042K4UX
+GenF0.menu.pnum.GENERIC_F042K4UX.build.product_line=STM32F042x6
+GenF0.menu.pnum.GENERIC_F042K4UX.build.variant=STM32F0xx/F042K(4-6)U
+GenF0.menu.pnum.GENERIC_F042K4UX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
+
+# Generic F042K6Ux
+GenF0.menu.pnum.GENERIC_F042K6UX=Generic F042K6Ux
+GenF0.menu.pnum.GENERIC_F042K6UX.upload.maximum_size=32768
+GenF0.menu.pnum.GENERIC_F042K6UX.upload.maximum_data_size=6144
+GenF0.menu.pnum.GENERIC_F042K6UX.build.board=GENERIC_F042K6UX
+GenF0.menu.pnum.GENERIC_F042K6UX.build.product_line=STM32F042x6
+GenF0.menu.pnum.GENERIC_F042K6UX.build.variant=STM32F0xx/F042K(4-6)U
+GenF0.menu.pnum.GENERIC_F042K6UX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
+
 # Generic F042T6Yx
 GenF0.menu.pnum.GENERIC_F042T6YX=Generic F042T6Yx
 GenF0.menu.pnum.GENERIC_F042T6YX.upload.maximum_size=32768

From c00a04f9f1f918c2807d4c6a4b3e3be4f8b57f22 Mon Sep 17 00:00:00 2001
From: jackb60 <40903548+jackb60@users.noreply.github.com>
Date: Mon, 3 Feb 2025 09:27:58 -0500
Subject: [PATCH 08/10] Update boards.txt

Signed-off-by: jackb60 <40903548+jackb60@users.noreply.github.com>
---
 boards.txt | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/boards.txt b/boards.txt
index f08631d400..a635b5b2e7 100644
--- a/boards.txt
+++ b/boards.txt
@@ -2073,15 +2073,6 @@ GenF0.menu.pnum.GENERIC_F042K4TX.build.product_line=STM32F042x6
 GenF0.menu.pnum.GENERIC_F042K4TX.build.variant=STM32F0xx/F042K(4-6)T
 GenF0.menu.pnum.GENERIC_F042K4TX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
 
-# Generic F042K6Tx
-GenF0.menu.pnum.GENERIC_F042K6TX=Generic F042K6Tx
-GenF0.menu.pnum.GENERIC_F042K6TX.upload.maximum_size=32768
-GenF0.menu.pnum.GENERIC_F042K6TX.upload.maximum_data_size=6144
-GenF0.menu.pnum.GENERIC_F042K6TX.build.board=GENERIC_F042K6TX
-GenF0.menu.pnum.GENERIC_F042K6TX.build.product_line=STM32F042x6
-GenF0.menu.pnum.GENERIC_F042K6TX.build.variant=STM32F0xx/F042K(4-6)T
-GenF0.menu.pnum.GENERIC_F042K6TX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
-
 # Generic F042K4Ux
 GenF0.menu.pnum.GENERIC_F042K4UX=Generic F042K4Ux
 GenF0.menu.pnum.GENERIC_F042K4UX.upload.maximum_size=16384
@@ -2091,6 +2082,15 @@ GenF0.menu.pnum.GENERIC_F042K4UX.build.product_line=STM32F042x6
 GenF0.menu.pnum.GENERIC_F042K4UX.build.variant=STM32F0xx/F042K(4-6)U
 GenF0.menu.pnum.GENERIC_F042K4UX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
 
+# Generic F042K6Tx
+GenF0.menu.pnum.GENERIC_F042K6TX=Generic F042K6Tx
+GenF0.menu.pnum.GENERIC_F042K6TX.upload.maximum_size=32768
+GenF0.menu.pnum.GENERIC_F042K6TX.upload.maximum_data_size=6144
+GenF0.menu.pnum.GENERIC_F042K6TX.build.board=GENERIC_F042K6TX
+GenF0.menu.pnum.GENERIC_F042K6TX.build.product_line=STM32F042x6
+GenF0.menu.pnum.GENERIC_F042K6TX.build.variant=STM32F0xx/F042K(4-6)T
+GenF0.menu.pnum.GENERIC_F042K6TX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
+
 # Generic F042K6Ux
 GenF0.menu.pnum.GENERIC_F042K6UX=Generic F042K6Ux
 GenF0.menu.pnum.GENERIC_F042K6UX.upload.maximum_size=32768

From dc26b4f0820a5609c1b8dbbb2fe3081dff902879 Mon Sep 17 00:00:00 2001
From: jackb60 <40903548+jackb60@users.noreply.github.com>
Date: Mon, 3 Feb 2025 09:45:21 -0500
Subject: [PATCH 09/10] Fix astyle

Signed-off-by: jackb60 <40903548+jackb60@users.noreply.github.com>
---
 .../STM32F0xx/F042K(4-6)U/generic_clock.c     | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/variants/STM32F0xx/F042K(4-6)U/generic_clock.c b/variants/STM32F0xx/F042K(4-6)U/generic_clock.c
index a5ac5e2822..e01870ef9e 100644
--- a/variants/STM32F0xx/F042K(4-6)U/generic_clock.c
+++ b/variants/STM32F0xx/F042K(4-6)U/generic_clock.c
@@ -27,36 +27,33 @@ WEAK void SystemClock_Config(void)
   /** Initializes the RCC Oscillators according to the specified parameters
   * in the RCC_OscInitTypeDef structure.
   */
-  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI|RCC_OSCILLATORTYPE_HSI48;
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI | RCC_OSCILLATORTYPE_HSI48;
   RCC_OscInitStruct.HSIState = RCC_HSI_ON;
   RCC_OscInitStruct.HSI48State = RCC_HSI48_ON;
   RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
   RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
-  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
-  {
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
     Error_Handler();
   }
 
   /** Initializes the CPU, AHB and APB buses clocks
   */
-  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
-                              |RCC_CLOCKTYPE_PCLK1;
+RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK
+                              | RCC_CLOCKTYPE_PCLK1;
   RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSI48;
   RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
   RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
 
-  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK)
-  {
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK) {
     Error_Handler();
   }
-  PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USB|RCC_PERIPHCLK_USART1
-                              |RCC_PERIPHCLK_I2C1;
+PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USB | RCC_PERIPHCLK_USART1
+                                     | RCC_PERIPHCLK_I2C1;
   PeriphClkInit.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK1;
   PeriphClkInit.I2c1ClockSelection = RCC_I2C1CLKSOURCE_HSI;
   PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_HSI48;
 
-  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
-  {
+  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) {
     Error_Handler();
   }
 }

From 3cc3baab895436bd8022bb1f693ad393adeebe32 Mon Sep 17 00:00:00 2001
From: jackb60 <40903548+jackb60@users.noreply.github.com>
Date: Mon, 3 Feb 2025 10:10:01 -0500
Subject: [PATCH 10/10] Update generic_clock.c

Signed-off-by: jackb60 <40903548+jackb60@users.noreply.github.com>
---
 variants/STM32F0xx/F042K(4-6)U/generic_clock.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/variants/STM32F0xx/F042K(4-6)U/generic_clock.c b/variants/STM32F0xx/F042K(4-6)U/generic_clock.c
index e01870ef9e..021aaf16da 100644
--- a/variants/STM32F0xx/F042K(4-6)U/generic_clock.c
+++ b/variants/STM32F0xx/F042K(4-6)U/generic_clock.c
@@ -38,8 +38,8 @@ WEAK void SystemClock_Config(void)
 
   /** Initializes the CPU, AHB and APB buses clocks
   */
-RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK
-                              | RCC_CLOCKTYPE_PCLK1;
+  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK
+                                | RCC_CLOCKTYPE_PCLK1;
   RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSI48;
   RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
   RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
@@ -47,8 +47,8 @@ RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK
   if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK) {
     Error_Handler();
   }
-PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USB | RCC_PERIPHCLK_USART1
-                                     | RCC_PERIPHCLK_I2C1;
+  PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USB | RCC_PERIPHCLK_USART1
+                                       | RCC_PERIPHCLK_I2C1;
   PeriphClkInit.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK1;
   PeriphClkInit.I2c1ClockSelection = RCC_I2C1CLKSOURCE_HSI;
   PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_HSI48;