diff --git a/boards/common/openocd-stm32.board.cmake b/boards/common/openocd-stm32.board.cmake index 855411fa34b..cecaba23529 100644 --- a/boards/common/openocd-stm32.board.cmake +++ b/boards/common/openocd-stm32.board.cmake @@ -18,3 +18,5 @@ elseif(CONFIG_SOC_SERIES_STM32F2X OR CONFIG_SOC_SERIES_STM32F7X) board_runner_args(openocd "--cmd-erase=stm32f2x mass_erase 0") endif() + +include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) diff --git a/boards/common/openocd.board.cmake b/boards/common/openocd.board.cmake index b1d09fe0a2d..14d32d4be25 100644 --- a/boards/common/openocd.board.cmake +++ b/boards/common/openocd.board.cmake @@ -20,6 +20,3 @@ board_finalize_runner_args(openocd --cmd-load "${OPENOCD_CMD_LOAD_DEFAULT}" --cmd-verify "${OPENOCD_CMD_VERIFY_DEFAULT}" ) - -# Manufacturer common options -include(${CMAKE_CURRENT_LIST_DIR}/openocd-stm32.board.cmake) diff --git a/boards/others/stm32f103_mini/board.cmake b/boards/others/stm32f103_mini/board.cmake index 20016aaba8e..12de9c0ee13 100644 --- a/boards/others/stm32f103_mini/board.cmake +++ b/boards/others/stm32f103_mini/board.cmake @@ -2,5 +2,5 @@ board_runner_args(jlink "--device=STM32F103RC" "--speed=4000") -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/b_l072z_lrwan1/board.cmake b/boards/st/b_l072z_lrwan1/board.cmake index d08734fa6c1..fb47b89a7f3 100644 --- a/boards/st/b_l072z_lrwan1/board.cmake +++ b/boards/st/b_l072z_lrwan1/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L072CZ" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/b_l4s5i_iot01a/board.cmake b/boards/st/b_l4s5i_iot01a/board.cmake index 9985ccb50b0..8318bf2e660 100644 --- a/boards/st/b_l4s5i_iot01a/board.cmake +++ b/boards/st/b_l4s5i_iot01a/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L4S5VI" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/b_u585i_iot02a/board.cmake b/boards/st/b_u585i_iot02a/board.cmake index 84bf22d1162..bb801eaae54 100644 --- a/boards/st/b_u585i_iot02a/board.cmake +++ b/boards/st/b_u585i_iot02a/board.cmake @@ -30,5 +30,5 @@ board_runner_args(jlink "--device=STM32U585AI" "--reset-after-load") include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) # FIXME: openocd runner requires use of STMicro openocd fork. # Check board documentation for more details. -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/disco_l475_iot1/board.cmake b/boards/st/disco_l475_iot1/board.cmake index 6eae838ebe3..6ef3d18c39c 100644 --- a/boards/st/disco_l475_iot1/board.cmake +++ b/boards/st/disco_l475_iot1/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L475VG" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_c071rb/board.cmake b/boards/st/nucleo_c071rb/board.cmake index 716846e4923..daa77274ae1 100644 --- a/boards/st/nucleo_c071rb/board.cmake +++ b/boards/st/nucleo_c071rb/board.cmake @@ -5,4 +5,4 @@ board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) diff --git a/boards/st/nucleo_f030r8/board.cmake b/boards/st/nucleo_f030r8/board.cmake index cd75a64d087..9c20b630831 100644 --- a/boards/st/nucleo_f030r8/board.cmake +++ b/boards/st/nucleo_f030r8/board.cmake @@ -7,6 +7,6 @@ board_runner_args(probe-rs "--chip=STM32F030R8Tx") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) include(${ZEPHYR_BASE}/boards/common/probe-rs.board.cmake) diff --git a/boards/st/nucleo_f031k6/board.cmake b/boards/st/nucleo_f031k6/board.cmake index da308d3659a..c3f7448688b 100644 --- a/boards/st/nucleo_f031k6/board.cmake +++ b/boards/st/nucleo_f031k6/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F031K6" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_f042k6/board.cmake b/boards/st/nucleo_f042k6/board.cmake index 3b4c81fc151..fd92c7b5edc 100644 --- a/boards/st/nucleo_f042k6/board.cmake +++ b/boards/st/nucleo_f042k6/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F042K6" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_f070rb/board.cmake b/boards/st/nucleo_f070rb/board.cmake index 720e4e00ab5..0d7cb7040ad 100644 --- a/boards/st/nucleo_f070rb/board.cmake +++ b/boards/st/nucleo_f070rb/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F070RB" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_f072rb/board.cmake b/boards/st/nucleo_f072rb/board.cmake index 136bd345f6a..f85a8e424ba 100644 --- a/boards/st/nucleo_f072rb/board.cmake +++ b/boards/st/nucleo_f072rb/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F072RB" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_f091rc/board.cmake b/boards/st/nucleo_f091rc/board.cmake index f465bc737b1..a05a4ed62f6 100644 --- a/boards/st/nucleo_f091rc/board.cmake +++ b/boards/st/nucleo_f091rc/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F091RC" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_f103rb/board.cmake b/boards/st/nucleo_f103rb/board.cmake index 724e7b7141f..9b122cd0c3a 100644 --- a/boards/st/nucleo_f103rb/board.cmake +++ b/boards/st/nucleo_f103rb/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F103RB" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_f207zg/board.cmake b/boards/st/nucleo_f207zg/board.cmake index 8c62e3ccbbf..c25042bcd14 100644 --- a/boards/st/nucleo_f207zg/board.cmake +++ b/boards/st/nucleo_f207zg/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F207ZG" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_f302r8/board.cmake b/boards/st/nucleo_f302r8/board.cmake index 4a80e30f04f..aa2e632bf8b 100644 --- a/boards/st/nucleo_f302r8/board.cmake +++ b/boards/st/nucleo_f302r8/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F302R8" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_f303k8/board.cmake b/boards/st/nucleo_f303k8/board.cmake index 179e15cfcab..2ee7dcf79ea 100644 --- a/boards/st/nucleo_f303k8/board.cmake +++ b/boards/st/nucleo_f303k8/board.cmake @@ -10,5 +10,5 @@ board_runner_args(pyocd "--flash-opt=-O connect_mode=under-reset") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_f303re/board.cmake b/boards/st/nucleo_f303re/board.cmake index a080f9119e1..f7b8c33c318 100644 --- a/boards/st/nucleo_f303re/board.cmake +++ b/boards/st/nucleo_f303re/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F303RE" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_f334r8/board.cmake b/boards/st/nucleo_f334r8/board.cmake index e98f17692ec..2ebdf5163f1 100644 --- a/boards/st/nucleo_f334r8/board.cmake +++ b/boards/st/nucleo_f334r8/board.cmake @@ -10,5 +10,5 @@ board_runner_args(pyocd "--flash-opt=-O connect_mode=under-reset") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_f401re/board.cmake b/boards/st/nucleo_f401re/board.cmake index 65321107f3a..0702d8e78e5 100644 --- a/boards/st/nucleo_f401re/board.cmake +++ b/boards/st/nucleo_f401re/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F401RE" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_f410rb/board.cmake b/boards/st/nucleo_f410rb/board.cmake index 5eb1ca02345..721238610c8 100644 --- a/boards/st/nucleo_f410rb/board.cmake +++ b/boards/st/nucleo_f410rb/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F410RB" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_f411re/board.cmake b/boards/st/nucleo_f411re/board.cmake index 2015a3f497a..a1e8a2d1e07 100644 --- a/boards/st/nucleo_f411re/board.cmake +++ b/boards/st/nucleo_f411re/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F411RE" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_f412zg/board.cmake b/boards/st/nucleo_f412zg/board.cmake index be8b35e82c8..2aa3b0baed3 100644 --- a/boards/st/nucleo_f412zg/board.cmake +++ b/boards/st/nucleo_f412zg/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F412ZG" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_f413zh/board.cmake b/boards/st/nucleo_f413zh/board.cmake index 800b779a42d..60c93ad815c 100644 --- a/boards/st/nucleo_f413zh/board.cmake +++ b/boards/st/nucleo_f413zh/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F413ZH" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_f429zi/board.cmake b/boards/st/nucleo_f429zi/board.cmake index 49ab35806ca..ece0ab69e17 100644 --- a/boards/st/nucleo_f429zi/board.cmake +++ b/boards/st/nucleo_f429zi/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F429ZI" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_f439zi/board.cmake b/boards/st/nucleo_f439zi/board.cmake index b7761f24ff3..cf35442892b 100644 --- a/boards/st/nucleo_f439zi/board.cmake +++ b/boards/st/nucleo_f439zi/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F439ZI" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_f446re/board.cmake b/boards/st/nucleo_f446re/board.cmake index b7d889530e8..14ae70bb37f 100644 --- a/boards/st/nucleo_f446re/board.cmake +++ b/boards/st/nucleo_f446re/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F446RE" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_f446ze/board.cmake b/boards/st/nucleo_f446ze/board.cmake index 33af015beeb..252e8c3b383 100644 --- a/boards/st/nucleo_f446ze/board.cmake +++ b/boards/st/nucleo_f446ze/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F446ZE" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_f722ze/board.cmake b/boards/st/nucleo_f722ze/board.cmake index fc8e64fe0b5..e4df7aa605f 100644 --- a/boards/st/nucleo_f722ze/board.cmake +++ b/boards/st/nucleo_f722ze/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F722ZE" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_f746zg/board.cmake b/boards/st/nucleo_f746zg/board.cmake index d1b2798ccdd..61dd9764578 100644 --- a/boards/st/nucleo_f746zg/board.cmake +++ b/boards/st/nucleo_f746zg/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F746ZG" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_f756zg/board.cmake b/boards/st/nucleo_f756zg/board.cmake index d6a50cef168..31f05e4c864 100644 --- a/boards/st/nucleo_f756zg/board.cmake +++ b/boards/st/nucleo_f756zg/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F756ZG" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_f767zi/board.cmake b/boards/st/nucleo_f767zi/board.cmake index 3df233b4a75..b4c75553386 100644 --- a/boards/st/nucleo_f767zi/board.cmake +++ b/boards/st/nucleo_f767zi/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F767ZI" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_g031k8/board.cmake b/boards/st/nucleo_g031k8/board.cmake index 332fe061efd..611111dc2cd 100644 --- a/boards/st/nucleo_g031k8/board.cmake +++ b/boards/st/nucleo_g031k8/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32G031K8" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_g070rb/board.cmake b/boards/st/nucleo_g070rb/board.cmake index e8ff9cd0ccb..5d9754c7567 100644 --- a/boards/st/nucleo_g070rb/board.cmake +++ b/boards/st/nucleo_g070rb/board.cmake @@ -9,6 +9,6 @@ board_runner_args(jlink "--device=STM32G070RB" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_g071rb/board.cmake b/boards/st/nucleo_g071rb/board.cmake index 14262985a8c..111c105af23 100644 --- a/boards/st/nucleo_g071rb/board.cmake +++ b/boards/st/nucleo_g071rb/board.cmake @@ -9,6 +9,6 @@ board_runner_args(jlink "--device=STM32G071RB" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_g0b1re/board.cmake b/boards/st/nucleo_g0b1re/board.cmake index 40365ef6885..67456b7b6a5 100644 --- a/boards/st/nucleo_g0b1re/board.cmake +++ b/boards/st/nucleo_g0b1re/board.cmake @@ -10,6 +10,6 @@ board_runner_args(jlink "--device=STM32G0B1RE" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_g431kb/board.cmake b/boards/st/nucleo_g431kb/board.cmake index 7d054ec941f..830889c5a07 100644 --- a/boards/st/nucleo_g431kb/board.cmake +++ b/boards/st/nucleo_g431kb/board.cmake @@ -8,5 +8,5 @@ board_runner_args(jlink "--device=STM32G431KB" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_g431rb/board.cmake b/boards/st/nucleo_g431rb/board.cmake index 19ba91a4a25..5d80995288e 100644 --- a/boards/st/nucleo_g431rb/board.cmake +++ b/boards/st/nucleo_g431rb/board.cmake @@ -8,5 +8,5 @@ board_runner_args(jlink "--device=STM32G431RB" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_g474re/board.cmake b/boards/st/nucleo_g474re/board.cmake index 9e4f74239fe..2dc259d0cc4 100644 --- a/boards/st/nucleo_g474re/board.cmake +++ b/boards/st/nucleo_g474re/board.cmake @@ -7,6 +7,6 @@ board_runner_args(jlink "--device=STM32G474RE" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_h503rb/board.cmake b/boards/st/nucleo_h503rb/board.cmake index 5ac7cb17f66..f6a2fdfb91b 100644 --- a/boards/st/nucleo_h503rb/board.cmake +++ b/boards/st/nucleo_h503rb/board.cmake @@ -12,5 +12,5 @@ board_runner_args(pyocd "--target=stm32h503rbtx") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) # FIXME: official openocd runner not yet available. diff --git a/boards/st/nucleo_h533re/board.cmake b/boards/st/nucleo_h533re/board.cmake index 963b13b03b2..ef9b8848c8d 100644 --- a/boards/st/nucleo_h533re/board.cmake +++ b/boards/st/nucleo_h533re/board.cmake @@ -15,5 +15,5 @@ board_runner_args(openocd "--no-halt") include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) # FIXME: official openocd runner not yet available. diff --git a/boards/st/nucleo_h563zi/board.cmake b/boards/st/nucleo_h563zi/board.cmake index be01446199a..f8974ae2be2 100644 --- a/boards/st/nucleo_h563zi/board.cmake +++ b/boards/st/nucleo_h563zi/board.cmake @@ -15,5 +15,5 @@ board_runner_args(openocd "--no-halt") include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) -#include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +#include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) # FIXME: official openocd runner not yet available. diff --git a/boards/st/nucleo_h723zg/board.cmake b/boards/st/nucleo_h723zg/board.cmake index b9e6be6fda5..68f24ee9e7d 100644 --- a/boards/st/nucleo_h723zg/board.cmake +++ b/boards/st/nucleo_h723zg/board.cmake @@ -7,5 +7,5 @@ board_runner_args(openocd --target-handle=_CHIPNAME.cpu0) # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_h743zi/board.cmake b/boards/st/nucleo_h743zi/board.cmake index 004ae3551ce..dcb50881c78 100644 --- a/boards/st/nucleo_h743zi/board.cmake +++ b/boards/st/nucleo_h743zi/board.cmake @@ -9,6 +9,6 @@ board_runner_args(pyocd "--target=stm32h743zitx") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) diff --git a/boards/st/nucleo_h745zi_q/board.cmake b/boards/st/nucleo_h745zi_q/board.cmake index 00797ab426f..6c604e1385e 100644 --- a/boards/st/nucleo_h745zi_q/board.cmake +++ b/boards/st/nucleo_h745zi_q/board.cmake @@ -12,5 +12,5 @@ endif() # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_h753zi/board.cmake b/boards/st/nucleo_h753zi/board.cmake index aa65b88b81a..d4a4d56a6f7 100644 --- a/boards/st/nucleo_h753zi/board.cmake +++ b/boards/st/nucleo_h753zi/board.cmake @@ -7,5 +7,5 @@ board_runner_args(openocd --target-handle=_CHIPNAME.cpu0) # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_h755zi_q/board.cmake b/boards/st/nucleo_h755zi_q/board.cmake index e703f23d147..bc87412503a 100644 --- a/boards/st/nucleo_h755zi_q/board.cmake +++ b/boards/st/nucleo_h755zi_q/board.cmake @@ -11,5 +11,5 @@ endif() # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_h7a3zi_q/board.cmake b/boards/st/nucleo_h7a3zi_q/board.cmake index e0cb9e0aac8..1b4afb944a6 100644 --- a/boards/st/nucleo_h7a3zi_q/board.cmake +++ b/boards/st/nucleo_h7a3zi_q/board.cmake @@ -7,5 +7,5 @@ board_runner_args(openocd --target-handle=_CHIPNAME.cpu0) # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_h7s3l8/board.cmake b/boards/st/nucleo_h7s3l8/board.cmake index 6c18b45b35e..e0005d1dc82 100644 --- a/boards/st/nucleo_h7s3l8/board.cmake +++ b/boards/st/nucleo_h7s3l8/board.cmake @@ -7,4 +7,4 @@ board_runner_args(openocd --target-handle=_CHIPNAME.cpu0) # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) diff --git a/boards/st/nucleo_l011k4/board.cmake b/boards/st/nucleo_l011k4/board.cmake index ed2af84d31e..e6e48d0da41 100644 --- a/boards/st/nucleo_l011k4/board.cmake +++ b/boards/st/nucleo_l011k4/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L011K4" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_l031k6/board.cmake b/boards/st/nucleo_l031k6/board.cmake index 90c28655ceb..6bce6845dc9 100644 --- a/boards/st/nucleo_l031k6/board.cmake +++ b/boards/st/nucleo_l031k6/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L031K6" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_l053r8/board.cmake b/boards/st/nucleo_l053r8/board.cmake index f6b83f83876..6ece30ff634 100644 --- a/boards/st/nucleo_l053r8/board.cmake +++ b/boards/st/nucleo_l053r8/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L053R8" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_l073rz/board.cmake b/boards/st/nucleo_l073rz/board.cmake index bd12f7d933b..d9a28a2a587 100644 --- a/boards/st/nucleo_l073rz/board.cmake +++ b/boards/st/nucleo_l073rz/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L073RZ" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_l152re/board.cmake b/boards/st/nucleo_l152re/board.cmake index 716846e4923..daa77274ae1 100644 --- a/boards/st/nucleo_l152re/board.cmake +++ b/boards/st/nucleo_l152re/board.cmake @@ -5,4 +5,4 @@ board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) diff --git a/boards/st/nucleo_l412rb_p/board.cmake b/boards/st/nucleo_l412rb_p/board.cmake index 0ee007da3c5..b012ee275ff 100644 --- a/boards/st/nucleo_l412rb_p/board.cmake +++ b/boards/st/nucleo_l412rb_p/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L412RB" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_l432kc/board.cmake b/boards/st/nucleo_l432kc/board.cmake index 20c7aec7e06..b7b34dd5ac4 100644 --- a/boards/st/nucleo_l432kc/board.cmake +++ b/boards/st/nucleo_l432kc/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L432KC" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_l433rc_p/board.cmake b/boards/st/nucleo_l433rc_p/board.cmake index cabd763429f..25dedfd7a4d 100644 --- a/boards/st/nucleo_l433rc_p/board.cmake +++ b/boards/st/nucleo_l433rc_p/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L433RC" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_l452re/board.cmake b/boards/st/nucleo_l452re/board.cmake index 61fc4681587..c5c4870747c 100644 --- a/boards/st/nucleo_l452re/board.cmake +++ b/boards/st/nucleo_l452re/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L452RE" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_l476rg/board.cmake b/boards/st/nucleo_l476rg/board.cmake index 8dd9a438478..416dde58a05 100644 --- a/boards/st/nucleo_l476rg/board.cmake +++ b/boards/st/nucleo_l476rg/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L476RG" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_l496zg/board.cmake b/boards/st/nucleo_l496zg/board.cmake index eab553680b0..80e172d1986 100644 --- a/boards/st/nucleo_l496zg/board.cmake +++ b/boards/st/nucleo_l496zg/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L496ZG" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_l4a6zg/board.cmake b/boards/st/nucleo_l4a6zg/board.cmake index 293f2736a07..be21d7cfcc4 100644 --- a/boards/st/nucleo_l4a6zg/board.cmake +++ b/boards/st/nucleo_l4a6zg/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L4A6ZG" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_l4r5zi/board.cmake b/boards/st/nucleo_l4r5zi/board.cmake index 2d7ce04b87e..9a6daaf3524 100644 --- a/boards/st/nucleo_l4r5zi/board.cmake +++ b/boards/st/nucleo_l4r5zi/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L4R5ZI" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_l552ze_q/board.cmake b/boards/st/nucleo_l552ze_q/board.cmake index 4308af48306..5d9c266860f 100644 --- a/boards/st/nucleo_l552ze_q/board.cmake +++ b/boards/st/nucleo_l552ze_q/board.cmake @@ -24,4 +24,4 @@ board_runner_args(pyocd "--target=stm32l552zetxq") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) diff --git a/boards/st/nucleo_u575zi_q/board.cmake b/boards/st/nucleo_u575zi_q/board.cmake index 17127a40101..14b6e98db67 100644 --- a/boards/st/nucleo_u575zi_q/board.cmake +++ b/boards/st/nucleo_u575zi_q/board.cmake @@ -11,6 +11,6 @@ board_runner_args(jlink "--device=STM32U575ZI" "--reset-after-load") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_u5a5zj_q/board.cmake b/boards/st/nucleo_u5a5zj_q/board.cmake index eeef658184f..e846f79f381 100644 --- a/boards/st/nucleo_u5a5zj_q/board.cmake +++ b/boards/st/nucleo_u5a5zj_q/board.cmake @@ -11,6 +11,6 @@ board_runner_args(jlink "--device=STM32U5A5ZJ" "--reset-after-load") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_wb05kz/board.cmake b/boards/st/nucleo_wb05kz/board.cmake index 84605805bba..c7de0154aa7 100644 --- a/boards/st/nucleo_wb05kz/board.cmake +++ b/boards/st/nucleo_wb05kz/board.cmake @@ -5,5 +5,5 @@ board_runner_args(pyocd "--target=stm32wb05kzvx") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) diff --git a/boards/st/nucleo_wb07cc/board.cmake b/boards/st/nucleo_wb07cc/board.cmake index d68dc289165..ec142ba8afd 100644 --- a/boards/st/nucleo_wb07cc/board.cmake +++ b/boards/st/nucleo_wb07cc/board.cmake @@ -5,5 +5,5 @@ board_runner_args(pyocd "--target=stm32wb07ccvx") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) diff --git a/boards/st/nucleo_wb55rg/board.cmake b/boards/st/nucleo_wb55rg/board.cmake index 13002e7ade4..ecde7d77aa4 100644 --- a/boards/st/nucleo_wb55rg/board.cmake +++ b/boards/st/nucleo_wb55rg/board.cmake @@ -6,5 +6,5 @@ board_runner_args(pyocd "--target=stm32wb55rgvx") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) diff --git a/boards/st/nucleo_wba55cg/board.cmake b/boards/st/nucleo_wba55cg/board.cmake index 9c612e9d0b0..0c8a7e50ed1 100644 --- a/boards/st/nucleo_wba55cg/board.cmake +++ b/boards/st/nucleo_wba55cg/board.cmake @@ -3,4 +3,4 @@ board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) diff --git a/boards/st/nucleo_wba65ri/board.cmake b/boards/st/nucleo_wba65ri/board.cmake index 5243407fcc0..828d1f367ab 100644 --- a/boards/st/nucleo_wba65ri/board.cmake +++ b/boards/st/nucleo_wba65ri/board.cmake @@ -3,4 +3,4 @@ board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) diff --git a/boards/st/nucleo_wl55jc/board.cmake b/boards/st/nucleo_wl55jc/board.cmake index 716846e4923..daa77274ae1 100644 --- a/boards/st/nucleo_wl55jc/board.cmake +++ b/boards/st/nucleo_wl55jc/board.cmake @@ -5,4 +5,4 @@ board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) diff --git a/boards/st/st25dv_mb1283_disco/board.cmake b/boards/st/st25dv_mb1283_disco/board.cmake index 16ce5db67ad..e1c11dddd8a 100644 --- a/boards/st/st25dv_mb1283_disco/board.cmake +++ b/boards/st/st25dv_mb1283_disco/board.cmake @@ -2,5 +2,5 @@ board_runner_args(jlink "--device=STM32F405RG" "--speed=4000") -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/steval_fcu001v1/board.cmake b/boards/st/steval_fcu001v1/board.cmake index 79f93bd9e6d..d2cac8292e1 100644 --- a/boards/st/steval_fcu001v1/board.cmake +++ b/boards/st/steval_fcu001v1/board.cmake @@ -2,7 +2,7 @@ board_runner_args(jlink "--device=STM32F401CC" "--speed=4000") -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/steval_stwinbx1/board.cmake b/boards/st/steval_stwinbx1/board.cmake index 1335413cee7..d11c7565bfc 100644 --- a/boards/st/steval_stwinbx1/board.cmake +++ b/boards/st/steval_stwinbx1/board.cmake @@ -16,4 +16,4 @@ board_runner_args(openocd "--no-halt") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) include(${ZEPHYR_BASE}/boards/common/dfu-util.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) diff --git a/boards/st/stm3210c_eval/board.cmake b/boards/st/stm3210c_eval/board.cmake index dace1b1db63..47550f8c812 100644 --- a/boards/st/stm3210c_eval/board.cmake +++ b/boards/st/stm3210c_eval/board.cmake @@ -2,5 +2,5 @@ board_runner_args(jlink "--device=STM32F107VC" "--speed=4000") -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32373c_eval/board.cmake b/boards/st/stm32373c_eval/board.cmake index c4303e2c481..b6a443b6bc3 100644 --- a/boards/st/stm32373c_eval/board.cmake +++ b/boards/st/stm32373c_eval/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F373VC" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32f072_eval/board.cmake b/boards/st/stm32f072_eval/board.cmake index f49b17d83bb..8876830a8e5 100644 --- a/boards/st/stm32f072_eval/board.cmake +++ b/boards/st/stm32f072_eval/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F072VB" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32f072b_disco/board.cmake b/boards/st/stm32f072b_disco/board.cmake index 136bd345f6a..f85a8e424ba 100644 --- a/boards/st/stm32f072b_disco/board.cmake +++ b/boards/st/stm32f072b_disco/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F072RB" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32f0_disco/board.cmake b/boards/st/stm32f0_disco/board.cmake index d36f83beb8f..888d731fe97 100644 --- a/boards/st/stm32f0_disco/board.cmake +++ b/boards/st/stm32f0_disco/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F051R8" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32f3_disco/board.cmake b/boards/st/stm32f3_disco/board.cmake index 553a53bf9ce..b2747a7cc46 100644 --- a/boards/st/stm32f3_disco/board.cmake +++ b/boards/st/stm32f3_disco/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F303VC" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32f411e_disco/board.cmake b/boards/st/stm32f411e_disco/board.cmake index b0408356c87..64d7eeb27d4 100644 --- a/boards/st/stm32f411e_disco/board.cmake +++ b/boards/st/stm32f411e_disco/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F411VE" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32f412g_disco/board.cmake b/boards/st/stm32f412g_disco/board.cmake index be8b35e82c8..2aa3b0baed3 100644 --- a/boards/st/stm32f412g_disco/board.cmake +++ b/boards/st/stm32f412g_disco/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F412ZG" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32f413h_disco/board.cmake b/boards/st/stm32f413h_disco/board.cmake index 800b779a42d..60c93ad815c 100644 --- a/boards/st/stm32f413h_disco/board.cmake +++ b/boards/st/stm32f413h_disco/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F413ZH" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32f429i_disc1/board.cmake b/boards/st/stm32f429i_disc1/board.cmake index 9f872edd546..836afa988e3 100644 --- a/boards/st/stm32f429i_disc1/board.cmake +++ b/boards/st/stm32f429i_disc1/board.cmake @@ -9,6 +9,6 @@ board_runner_args(pyocd "--flash-opt=-O connect_mode=under-reset") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) diff --git a/boards/st/stm32f469i_disco/board.cmake b/boards/st/stm32f469i_disco/board.cmake index 327c95da4fa..a71f6bc4b44 100644 --- a/boards/st/stm32f469i_disco/board.cmake +++ b/boards/st/stm32f469i_disco/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F469NI" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32f4_disco/board.cmake b/boards/st/stm32f4_disco/board.cmake index a2c5eefa38c..3788e6369a8 100644 --- a/boards/st/stm32f4_disco/board.cmake +++ b/boards/st/stm32f4_disco/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F407VG" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32f723e_disco/board.cmake b/boards/st/stm32f723e_disco/board.cmake index 7a99727f266..ed50a01ca8a 100644 --- a/boards/st/stm32f723e_disco/board.cmake +++ b/boards/st/stm32f723e_disco/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F723IE" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32f746g_disco/board.cmake b/boards/st/stm32f746g_disco/board.cmake index 968e8cfa890..05504d07722 100644 --- a/boards/st/stm32f746g_disco/board.cmake +++ b/boards/st/stm32f746g_disco/board.cmake @@ -8,5 +8,5 @@ board_runner_args(jlink "--device=STM32F746NG" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32f7508_dk/board.cmake b/boards/st/stm32f7508_dk/board.cmake index 83aae9337d6..8565d87dc51 100644 --- a/boards/st/stm32f7508_dk/board.cmake +++ b/boards/st/stm32f7508_dk/board.cmake @@ -7,5 +7,5 @@ board_runner_args(jlink "--device=STM32F750N8" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32f769i_disco/board.cmake b/boards/st/stm32f769i_disco/board.cmake index 6df48aa7403..ba101beac08 100644 --- a/boards/st/stm32f769i_disco/board.cmake +++ b/boards/st/stm32f769i_disco/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F769NI" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32g0316_disco/board.cmake b/boards/st/stm32g0316_disco/board.cmake index 30495593070..3b7b8e59217 100644 --- a/boards/st/stm32g0316_disco/board.cmake +++ b/boards/st/stm32g0316_disco/board.cmake @@ -7,6 +7,6 @@ board_runner_args(jlink "--device=STM32G031J6" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32h573i_dk/board.cmake b/boards/st/stm32h573i_dk/board.cmake index dedf7ebcd0a..1ce1627e7eb 100644 --- a/boards/st/stm32h573i_dk/board.cmake +++ b/boards/st/stm32h573i_dk/board.cmake @@ -20,5 +20,5 @@ board_runner_args(openocd "--no-halt") include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) include(${ZEPHYR_BASE}/boards/common/probe-rs.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) # FIXME: official openocd runner not yet available. diff --git a/boards/st/stm32h735g_disco/board.cmake b/boards/st/stm32h735g_disco/board.cmake index ef05a214927..1762b3e72b7 100644 --- a/boards/st/stm32h735g_disco/board.cmake +++ b/boards/st/stm32h735g_disco/board.cmake @@ -8,5 +8,5 @@ board_runner_args(openocd --target-handle=_CHIPNAME.cpu0) # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32h745i_disco/board.cmake b/boards/st/stm32h745i_disco/board.cmake index d9453fbb534..effd920d464 100644 --- a/boards/st/stm32h745i_disco/board.cmake +++ b/boards/st/stm32h745i_disco/board.cmake @@ -19,5 +19,5 @@ endif() # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32h747i_disco/board.cmake b/boards/st/stm32h747i_disco/board.cmake index 6b22ac50217..145a1bf9e78 100644 --- a/boards/st/stm32h747i_disco/board.cmake +++ b/boards/st/stm32h747i_disco/board.cmake @@ -21,5 +21,5 @@ endif() # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32h750b_dk/board.cmake b/boards/st/stm32h750b_dk/board.cmake index 479fe1abc2e..7ca52afb25f 100644 --- a/boards/st/stm32h750b_dk/board.cmake +++ b/boards/st/stm32h750b_dk/board.cmake @@ -13,5 +13,5 @@ board_runner_args(openocd --target-handle=_CHIPNAME.cpu0) # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32h757i_eval/board.cmake b/boards/st/stm32h757i_eval/board.cmake index b0a38149731..f5a0f5f38cc 100644 --- a/boards/st/stm32h757i_eval/board.cmake +++ b/boards/st/stm32h757i_eval/board.cmake @@ -17,5 +17,5 @@ endif() # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32h7b3i_dk/board.cmake b/boards/st/stm32h7b3i_dk/board.cmake index 88f340c9331..054803a1ed5 100644 --- a/boards/st/stm32h7b3i_dk/board.cmake +++ b/boards/st/stm32h7b3i_dk/board.cmake @@ -14,5 +14,5 @@ board_runner_args(openocd --target-handle=_CHIPNAME.cpu0) # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32h7s78_dk/board.cmake b/boards/st/stm32h7s78_dk/board.cmake index 79bb6fcc70b..9de6ed63802 100644 --- a/boards/st/stm32h7s78_dk/board.cmake +++ b/boards/st/stm32h7s78_dk/board.cmake @@ -7,4 +7,4 @@ board_runner_args(openocd --target-handle=_CHIPNAME.cpu0) # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) # FIXME: openocd runner not yet available. -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) diff --git a/boards/st/stm32l1_disco/board.cmake b/boards/st/stm32l1_disco/board.cmake index c8967fe8139..502c057f7c0 100644 --- a/boards/st/stm32l1_disco/board.cmake +++ b/boards/st/stm32l1_disco/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L151RB" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32l476g_disco/board.cmake b/boards/st/stm32l476g_disco/board.cmake index 76b5877ddfe..8b833a9e8cc 100644 --- a/boards/st/stm32l476g_disco/board.cmake +++ b/boards/st/stm32l476g_disco/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L476VG" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32l496g_disco/board.cmake b/boards/st/stm32l496g_disco/board.cmake index b6f4be86151..3f7e680f9bc 100644 --- a/boards/st/stm32l496g_disco/board.cmake +++ b/boards/st/stm32l496g_disco/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L496AG" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32l4r9i_disco/board.cmake b/boards/st/stm32l4r9i_disco/board.cmake index ea87b4f9548..d6e09512485 100644 --- a/boards/st/stm32l4r9i_disco/board.cmake +++ b/boards/st/stm32l4r9i_disco/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L4R9AI" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32l562e_dk/board.cmake b/boards/st/stm32l562e_dk/board.cmake index e3f5f878df2..da9e4b17092 100644 --- a/boards/st/stm32l562e_dk/board.cmake +++ b/boards/st/stm32l562e_dk/board.cmake @@ -20,5 +20,5 @@ board_runner_args(jlink "--device=STM32L562QE" "--speed=4000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32mp135f_dk/board.cmake b/boards/st/stm32mp135f_dk/board.cmake index af21b180317..8dbfad9db3c 100644 --- a/boards/st/stm32mp135f_dk/board.cmake +++ b/boards/st/stm32mp135f_dk/board.cmake @@ -1,6 +1,6 @@ # Copyright (c) 2025 STMicroelectronics # SPDX-License-Identifier: Apache-2.0 -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) board_runner_args(openocd "--config=${BOARD_DIR}/support/openocd.cfg") diff --git a/boards/st/stm32mp157c_dk2/board.cmake b/boards/st/stm32mp157c_dk2/board.cmake index 4c4c6aacb5e..50b0e205692 100644 --- a/boards/st/stm32mp157c_dk2/board.cmake +++ b/boards/st/stm32mp157c_dk2/board.cmake @@ -1,5 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) board_runner_args(openocd "--config=${BOARD_DIR}/support/openocd.cfg") diff --git a/boards/st/stm32u5a9j_dk/board.cmake b/boards/st/stm32u5a9j_dk/board.cmake index 5bb38a1d9c6..de8a4cb9553 100644 --- a/boards/st/stm32u5a9j_dk/board.cmake +++ b/boards/st/stm32u5a9j_dk/board.cmake @@ -10,4 +10,4 @@ board_runner_args(openocd "--no-halt") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) diff --git a/boards/st/stm32u5g9j_dk1/board.cmake b/boards/st/stm32u5g9j_dk1/board.cmake index 5bb38a1d9c6..de8a4cb9553 100644 --- a/boards/st/stm32u5g9j_dk1/board.cmake +++ b/boards/st/stm32u5g9j_dk1/board.cmake @@ -10,4 +10,4 @@ board_runner_args(openocd "--no-halt") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) diff --git a/boards/st/stm32u5g9j_dk2/board.cmake b/boards/st/stm32u5g9j_dk2/board.cmake index c3617f2cfb1..2bce8d8fc43 100644 --- a/boards/st/stm32u5g9j_dk2/board.cmake +++ b/boards/st/stm32u5g9j_dk2/board.cmake @@ -10,4 +10,4 @@ board_runner_args(openocd "--no-halt") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) diff --git a/boards/st/stm32vl_disco/board.cmake b/boards/st/stm32vl_disco/board.cmake index 7d5a94fd80f..bf19c690fb3 100644 --- a/boards/st/stm32vl_disco/board.cmake +++ b/boards/st/stm32vl_disco/board.cmake @@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F100RB" "--speed=8000") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/stm32wb5mm_dk/board.cmake b/boards/st/stm32wb5mm_dk/board.cmake index 5220869e9f0..834976c5dd4 100644 --- a/boards/st/stm32wb5mm_dk/board.cmake +++ b/boards/st/stm32wb5mm_dk/board.cmake @@ -6,5 +6,5 @@ board_runner_args(pyocd "--target=stm32wb55vgyx") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) diff --git a/boards/st/stm32wb5mmg/board.cmake b/boards/st/stm32wb5mmg/board.cmake index 5220869e9f0..834976c5dd4 100644 --- a/boards/st/stm32wb5mmg/board.cmake +++ b/boards/st/stm32wb5mmg/board.cmake @@ -6,5 +6,5 @@ board_runner_args(pyocd "--target=stm32wb55vgyx") # keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) diff --git a/doc/releases/migration-guide-4.2.rst b/doc/releases/migration-guide-4.2.rst index 1c9e172060c..1ecdc701d55 100644 --- a/doc/releases/migration-guide-4.2.rst +++ b/doc/releases/migration-guide-4.2.rst @@ -79,6 +79,10 @@ Boards * Espressif boards ``esp32_devkitc_wroom`` and ``esp32_devkitc_wrover`` shared almost identical features. The differences are covered by the Kconfig options so both boards were merged into ``esp32_devkitc``. +* STM32 boards should now add OpenOCD programming support by including ``openocd-stm32.board.cmake`` + instead of ``openocd.board.cmake``. The ``openocd-stm32.board.cmake`` file extends the default + OpenOCD runner with manufacturer-specific configuration like STM32 mass erase commands. + Device Drivers and Devicetree *****************************