Skip to content

Commit 595fa2b

Browse files
MaroMetelskikartben
MaroMetelski
authored and
kartben
committed
boards: openocd: Use STM32-specific configuration for ST boards
The OpenOCD STM32-specific configuration was included into the common configuration, which was then used in board files. Follow nRF5 convention instead: use manufacturer-specific config in boards. Also due to the fact that the include of STM32-specific config was placed *after* board_finalize_runner_args() it didn't really work anyways. Signed-off-by: Marek Metelski <[email protected]>
1 parent 4f69acc commit 595fa2b

File tree

114 files changed

+117
-114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+117
-114
lines changed

‎boards/common/openocd-stm32.board.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,5 @@ elseif(CONFIG_SOC_SERIES_STM32F2X OR
1818
CONFIG_SOC_SERIES_STM32F7X)
1919
board_runner_args(openocd "--cmd-erase=stm32f2x mass_erase 0")
2020
endif()
21+
22+
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)

‎boards/common/openocd.board.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,3 @@ board_finalize_runner_args(openocd
2020
--cmd-load "${OPENOCD_CMD_LOAD_DEFAULT}"
2121
--cmd-verify "${OPENOCD_CMD_VERIFY_DEFAULT}"
2222
)
23-
24-
# Manufacturer common options
25-
include(${CMAKE_CURRENT_LIST_DIR}/openocd-stm32.board.cmake)

‎boards/others/stm32f103_mini/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
board_runner_args(jlink "--device=STM32F103RC" "--speed=4000")
44

5-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
5+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
66
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/b_l072z_lrwan1/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L072CZ" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/b_l4s5i_iot01a/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L4S5VI" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/b_u585i_iot02a/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ board_runner_args(jlink "--device=STM32U585AI" "--reset-after-load")
3030
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
3131
# FIXME: openocd runner requires use of STMicro openocd fork.
3232
# Check board documentation for more details.
33-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
33+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
3434
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/disco_l475_iot1/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L475VG" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_c071rb/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw")
55

66
# keep first
77
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
8-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
8+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)

‎boards/st/nucleo_f030r8/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ board_runner_args(probe-rs "--chip=STM32F030R8Tx")
77

88
# keep first
99
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
10-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
10+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1111
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
1212
include(${ZEPHYR_BASE}/boards/common/probe-rs.board.cmake)

‎boards/st/nucleo_f031k6/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F031K6" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_f042k6/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F042K6" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_f070rb/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F070RB" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_f072rb/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F072RB" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_f091rc/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F091RC" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_f103rb/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F103RB" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_f207zg/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F207ZG" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_f302r8/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F302R8" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_f303k8/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ board_runner_args(pyocd "--flash-opt=-O connect_mode=under-reset")
1010
# keep first
1111
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
1212
include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
13-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
13+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1414
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_f303re/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F303RE" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_f334r8/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ board_runner_args(pyocd "--flash-opt=-O connect_mode=under-reset")
1010
# keep first
1111
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
1212
include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
13-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
13+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1414
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_f401re/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F401RE" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_f410rb/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F410RB" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_f411re/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F411RE" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_f412zg/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F412ZG" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_f413zh/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F413ZH" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_f429zi/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F429ZI" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_f439zi/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F439ZI" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_f446re/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F446RE" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_f446ze/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F446ZE" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_f722ze/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F722ZE" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_f746zg/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F746ZG" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_f756zg/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F756ZG" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_f767zi/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32F767ZI" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_g031k8/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32G031K8" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_g070rb/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ board_runner_args(jlink "--device=STM32G070RB" "--speed=4000")
99

1010
# keep first
1111
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
12-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
12+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1313
include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
1414
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_g071rb/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ board_runner_args(jlink "--device=STM32G071RB" "--speed=4000")
99

1010
# keep first
1111
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
12-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
12+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1313
include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
1414
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_g0b1re/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ board_runner_args(jlink "--device=STM32G0B1RE" "--speed=4000")
1010

1111
# keep first
1212
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
13-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
13+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1414
include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
1515
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_g431kb/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ board_runner_args(jlink "--device=STM32G431KB" "--speed=4000")
88
# keep first
99
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
11-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
11+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1212
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_g431rb/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ board_runner_args(jlink "--device=STM32G431RB" "--speed=4000")
88
# keep first
99
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
11-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
11+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1212
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_g474re/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ board_runner_args(jlink "--device=STM32G474RE" "--speed=4000")
77

88
# keep first
99
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
10-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
10+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1111
include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
1212
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_h503rb/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ board_runner_args(pyocd "--target=stm32h503rbtx")
1212
# keep first
1313
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
1414
include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
15-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
15+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1616
# FIXME: official openocd runner not yet available.

‎boards/st/nucleo_h533re/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ board_runner_args(openocd "--no-halt")
1515
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
1616
include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
1717
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
18-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
18+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1919
# FIXME: official openocd runner not yet available.

‎boards/st/nucleo_h563zi/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ board_runner_args(openocd "--no-halt")
1515
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
1616
include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
1717
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
18-
#include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
18+
#include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1919
# FIXME: official openocd runner not yet available.

‎boards/st/nucleo_h723zg/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ board_runner_args(openocd --target-handle=_CHIPNAME.cpu0)
77

88
# keep first
99
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
10-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
10+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1111
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_h743zi/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ board_runner_args(pyocd "--target=stm32h743zitx")
99

1010
# keep first
1111
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
12-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
12+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1313
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
1414
include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)

‎boards/st/nucleo_h745zi_q/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ endif()
1212

1313
# keep first
1414
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
15-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
15+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1616
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_h753zi/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ board_runner_args(openocd --target-handle=_CHIPNAME.cpu0)
77

88
# keep first
99
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
10-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
10+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1111
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_h755zi_q/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ endif()
1111

1212
# keep first
1313
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
14-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
14+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1515
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_h7a3zi_q/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ board_runner_args(openocd --target-handle=_CHIPNAME.cpu0)
77

88
# keep first
99
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
10-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
10+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1111
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_h7s3l8/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ board_runner_args(openocd --target-handle=_CHIPNAME.cpu0)
77

88
# keep first
99
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
10-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
10+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)

‎boards/st/nucleo_l011k4/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L011K4" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_l031k6/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L031K6" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_l053r8/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L053R8" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_l073rz/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L073RZ" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

‎boards/st/nucleo_l152re/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw")
55

66
# keep first
77
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
8-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
8+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)

‎boards/st/nucleo_l412rb_p/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ board_runner_args(jlink "--device=STM32L412RB" "--speed=4000")
66

77
# keep first
88
include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
9-
include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
9+
include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
1010
include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

0 commit comments

Comments
 (0)