diff --git a/boards/st/b_g474e_dpow1/board.cmake b/boards/st/b_g474e_dpow1/board.cmake index b315703cd96..b77e3f43c2f 100644 --- a/boards/st/b_g474e_dpow1/board.cmake +++ b/boards/st/b_g474e_dpow1/board.cmake @@ -1,6 +1,7 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +# keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) - diff --git a/boards/st/b_l072z_lrwan1/board.cmake b/boards/st/b_l072z_lrwan1/board.cmake index ef270a0abc8..d08734fa6c1 100644 --- a/boards/st/b_l072z_lrwan1/board.cmake +++ b/boards/st/b_l072z_lrwan1/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/b_l4s5i_iot01a/board.cmake b/boards/st/b_l4s5i_iot01a/board.cmake index d3088e3404d..9985ccb50b0 100644 --- a/boards/st/b_l4s5i_iot01a/board.cmake +++ b/boards/st/b_l4s5i_iot01a/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/b_u585i_iot02a/board.cmake b/boards/st/b_u585i_iot02a/board.cmake index dc59f6f17fb..84bf22d1162 100644 --- a/boards/st/b_u585i_iot02a/board.cmake +++ b/boards/st/b_u585i_iot02a/board.cmake @@ -12,6 +12,7 @@ if(CONFIG_BUILD_WITH_TFM) endif() endif() +# keep first if(CONFIG_STM32_MEMMAP) board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") board_runner_args(stm32cubeprogrammer "--extload=MX25LM51245G_STM32U585I-IOT02A.stldr") @@ -25,6 +26,7 @@ board_runner_args(openocd "--no-halt") board_runner_args(jlink "--device=STM32U585AI" "--reset-after-load") +# keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) # FIXME: openocd runner requires use of STMicro openocd fork. # Check board documentation for more details. diff --git a/boards/st/disco_l475_iot1/board.cmake b/boards/st/disco_l475_iot1/board.cmake index 7e6faf6c383..6eae838ebe3 100644 --- a/boards/st/disco_l475_iot1/board.cmake +++ b/boards/st/disco_l475_iot1/board.cmake @@ -1,8 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) -include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) diff --git a/boards/st/nucleo_c031c6/board.cmake b/boards/st/nucleo_c031c6/board.cmake index d1a6cbfe6f2..b77e3f43c2f 100644 --- a/boards/st/nucleo_c031c6/board.cmake +++ b/boards/st/nucleo_c031c6/board.cmake @@ -1,5 +1,7 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +# keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) diff --git a/boards/st/nucleo_f030r8/board.cmake b/boards/st/nucleo_f030r8/board.cmake index 73e0f5af640..cd75a64d087 100644 --- a/boards/st/nucleo_f030r8/board.cmake +++ b/boards/st/nucleo_f030r8/board.cmake @@ -1,8 +1,12 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") board_runner_args(jlink "--device=STM32F030R8" "--speed=4000") 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/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 bd51554e8c6..da308d3659a 100644 --- a/boards/st/nucleo_f031k6/board.cmake +++ b/boards/st/nucleo_f031k6/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_f042k6/board.cmake b/boards/st/nucleo_f042k6/board.cmake index 807467728e0..3b4c81fc151 100644 --- a/boards/st/nucleo_f042k6/board.cmake +++ b/boards/st/nucleo_f042k6/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_f070rb/board.cmake b/boards/st/nucleo_f070rb/board.cmake index 1237980142c..720e4e00ab5 100644 --- a/boards/st/nucleo_f070rb/board.cmake +++ b/boards/st/nucleo_f070rb/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_f091rc/board.cmake b/boards/st/nucleo_f091rc/board.cmake index 690716f6c5f..f465bc737b1 100644 --- a/boards/st/nucleo_f091rc/board.cmake +++ b/boards/st/nucleo_f091rc/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_f103rb/board.cmake b/boards/st/nucleo_f103rb/board.cmake index 51a6e9ef3bd..724e7b7141f 100644 --- a/boards/st/nucleo_f103rb/board.cmake +++ b/boards/st/nucleo_f103rb/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_f207zg/board.cmake b/boards/st/nucleo_f207zg/board.cmake index cf18155b5f3..8c62e3ccbbf 100644 --- a/boards/st/nucleo_f207zg/board.cmake +++ b/boards/st/nucleo_f207zg/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_f302r8/board.cmake b/boards/st/nucleo_f302r8/board.cmake index 7a5cef9c37e..4a80e30f04f 100644 --- a/boards/st/nucleo_f302r8/board.cmake +++ b/boards/st/nucleo_f302r8/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_f303k8/board.cmake b/boards/st/nucleo_f303k8/board.cmake index 98c430bd2af..179e15cfcab 100644 --- a/boards/st/nucleo_f303k8/board.cmake +++ b/boards/st/nucleo_f303k8/board.cmake @@ -1,11 +1,13 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") board_runner_args(jlink "--device=STM32F303K8" "--speed=4000") board_runner_args(pyocd "--target=stm32f303k8tx") board_runner_args(pyocd "--flash-opt=-O reset_type=hw") board_runner_args(pyocd "--flash-opt=-O connect_mode=under-reset") -board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +# 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) diff --git a/boards/st/nucleo_f303re/board.cmake b/boards/st/nucleo_f303re/board.cmake index 95fc7d4239a..a080f9119e1 100644 --- a/boards/st/nucleo_f303re/board.cmake +++ b/boards/st/nucleo_f303re/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_f334r8/board.cmake b/boards/st/nucleo_f334r8/board.cmake index 516a7ddfb13..e98f17692ec 100644 --- a/boards/st/nucleo_f334r8/board.cmake +++ b/boards/st/nucleo_f334r8/board.cmake @@ -1,11 +1,13 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") board_runner_args(jlink "--device=STM32F334R8" "--speed=4000") board_runner_args(pyocd "--target=stm32f334r8tx") board_runner_args(pyocd "--flash-opt=-O reset_type=hw") board_runner_args(pyocd "--flash-opt=-O connect_mode=under-reset") -board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +# 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) diff --git a/boards/st/nucleo_f401re/board.cmake b/boards/st/nucleo_f401re/board.cmake index 2345a9299f9..65321107f3a 100644 --- a/boards/st/nucleo_f401re/board.cmake +++ b/boards/st/nucleo_f401re/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_f410rb/board.cmake b/boards/st/nucleo_f410rb/board.cmake index 2cc7742cc2d..5eb1ca02345 100644 --- a/boards/st/nucleo_f410rb/board.cmake +++ b/boards/st/nucleo_f410rb/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_f411re/board.cmake b/boards/st/nucleo_f411re/board.cmake index 5cd8f3b7096..2015a3f497a 100644 --- a/boards/st/nucleo_f411re/board.cmake +++ b/boards/st/nucleo_f411re/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_f412zg/board.cmake b/boards/st/nucleo_f412zg/board.cmake index 8b2cd0fca43..be8b35e82c8 100644 --- a/boards/st/nucleo_f412zg/board.cmake +++ b/boards/st/nucleo_f412zg/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_f413zh/board.cmake b/boards/st/nucleo_f413zh/board.cmake index 0fbe4518143..800b779a42d 100644 --- a/boards/st/nucleo_f413zh/board.cmake +++ b/boards/st/nucleo_f413zh/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_f429zi/board.cmake b/boards/st/nucleo_f429zi/board.cmake index 7e8103a64b0..49ab35806ca 100644 --- a/boards/st/nucleo_f429zi/board.cmake +++ b/boards/st/nucleo_f429zi/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_f446re/board.cmake b/boards/st/nucleo_f446re/board.cmake index bc1e4722363..b7d889530e8 100644 --- a/boards/st/nucleo_f446re/board.cmake +++ b/boards/st/nucleo_f446re/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_f446ze/board.cmake b/boards/st/nucleo_f446ze/board.cmake index 715b84061aa..33af015beeb 100644 --- a/boards/st/nucleo_f446ze/board.cmake +++ b/boards/st/nucleo_f446ze/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_f722ze/board.cmake b/boards/st/nucleo_f722ze/board.cmake index 6335e34584a..fc8e64fe0b5 100644 --- a/boards/st/nucleo_f722ze/board.cmake +++ b/boards/st/nucleo_f722ze/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_f746zg/board.cmake b/boards/st/nucleo_f746zg/board.cmake index 718b783f69d..d1b2798ccdd 100644 --- a/boards/st/nucleo_f746zg/board.cmake +++ b/boards/st/nucleo_f746zg/board.cmake @@ -1,8 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_f756zg/board.cmake b/boards/st/nucleo_f756zg/board.cmake index 78ef5cce6a5..d6a50cef168 100644 --- a/boards/st/nucleo_f756zg/board.cmake +++ b/boards/st/nucleo_f756zg/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_f767zi/board.cmake b/boards/st/nucleo_f767zi/board.cmake index 796c2a4f35a..3df233b4a75 100644 --- a/boards/st/nucleo_f767zi/board.cmake +++ b/boards/st/nucleo_f767zi/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_g031k8/board.cmake b/boards/st/nucleo_g031k8/board.cmake index 8b8ec50a6b6..332fe061efd 100644 --- a/boards/st/nucleo_g031k8/board.cmake +++ b/boards/st/nucleo_g031k8/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_g070rb/board.cmake b/boards/st/nucleo_g070rb/board.cmake index 3e31c30f8a8..e8ff9cd0ccb 100644 --- a/boards/st/nucleo_g070rb/board.cmake +++ b/boards/st/nucleo_g070rb/board.cmake @@ -1,11 +1,14 @@ # SPDX-License-Identifier: Apache-2.0 + +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") board_runner_args(pyocd "--target=stm32g070rbtx") board_runner_args(pyocd "--flash-opt=-O reset_type=hw") board_runner_args(pyocd "--flash-opt=-O connect_mode=under-reset") board_runner_args(jlink "--device=STM32G070RB" "--speed=4000") -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/pyocd.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) -include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) diff --git a/boards/st/nucleo_g071rb/board.cmake b/boards/st/nucleo_g071rb/board.cmake index 124a3aac9fe..14262985a8c 100644 --- a/boards/st/nucleo_g071rb/board.cmake +++ b/boards/st/nucleo_g071rb/board.cmake @@ -1,11 +1,14 @@ # SPDX-License-Identifier: Apache-2.0 + +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") board_runner_args(pyocd "--target=stm32g071rbtx") board_runner_args(pyocd "--flash-opt=-O reset_type=hw") board_runner_args(pyocd "--flash-opt=-O connect_mode=under-reset") board_runner_args(jlink "--device=STM32G071RB" "--speed=4000") -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/pyocd.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) -include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) diff --git a/boards/st/nucleo_g0b1re/board.cmake b/boards/st/nucleo_g0b1re/board.cmake index 142aeaaa3ae..7a83f9d6a46 100644 --- a/boards/st/nucleo_g0b1re/board.cmake +++ b/boards/st/nucleo_g0b1re/board.cmake @@ -1,12 +1,16 @@ # SPDX-License-Identifier: Apache-2.0 + +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") + # keil.stm32g0xx_dfp.1.3.0.pack introduced stm32g0b series, but the target does # not work with pyocd currently. board_runner_args(pyocd "--target=stm32g071rbtx") board_runner_args(pyocd "--flash-opt=-O reset_type=hw") board_runner_args(pyocd "--flash-opt=-O connect_mode=under-reset") board_runner_args(jlink "--device=STM32G0B1RE" "--speed=4000") -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/pyocd.board.cmake) diff --git a/boards/st/nucleo_g431rb/board.cmake b/boards/st/nucleo_g431rb/board.cmake index d23382841d3..7a680ee8d4b 100644 --- a/boards/st/nucleo_g431rb/board.cmake +++ b/boards/st/nucleo_g431rb/board.cmake @@ -1,5 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 + +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") board_runner_args(pyocd "--target=stm32g431rbtx") +# 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) diff --git a/boards/st/nucleo_g474re/board.cmake b/boards/st/nucleo_g474re/board.cmake index b8f4ae4e6e8..3c3ffc9e7ff 100644 --- a/boards/st/nucleo_g474re/board.cmake +++ b/boards/st/nucleo_g474re/board.cmake @@ -1,8 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 -board_runner_args(pyocd "--target=stm32g474retx") +# keep first board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +board_runner_args(pyocd "--target=stm32g474retx") +# keep first +include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) -include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) diff --git a/boards/st/nucleo_h503rb/board.cmake b/boards/st/nucleo_h503rb/board.cmake index 97f845e59f2..5ac7cb17f66 100644 --- a/boards/st/nucleo_h503rb/board.cmake +++ b/boards/st/nucleo_h503rb/board.cmake @@ -1,5 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") board_runner_args(openocd "--tcl-port=6666") @@ -8,6 +9,7 @@ board_runner_args(openocd "--no-halt") 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) diff --git a/boards/st/nucleo_h533re/board.cmake b/boards/st/nucleo_h533re/board.cmake index 32d2caa6514..963b13b03b2 100644 --- a/boards/st/nucleo_h533re/board.cmake +++ b/boards/st/nucleo_h533re/board.cmake @@ -1,5 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") board_runner_args(pyocd "--target=stm32h533retx") @@ -10,6 +11,7 @@ board_runner_args(openocd "--tcl-port=6666") board_runner_args(openocd --cmd-pre-init "gdb_report_data_abort enable") board_runner_args(openocd "--no-halt") +# keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_h563zi/board.cmake b/boards/st/nucleo_h563zi/board.cmake index 50f4c3f2699..be01446199a 100644 --- a/boards/st/nucleo_h563zi/board.cmake +++ b/boards/st/nucleo_h563zi/board.cmake @@ -1,5 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") board_runner_args(pyocd "--target=stm32h563zitx") @@ -10,6 +11,7 @@ board_runner_args(openocd "--tcl-port=6666") board_runner_args(openocd --cmd-pre-init "gdb_report_data_abort enable") board_runner_args(openocd "--no-halt") +# keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/st/nucleo_h723zg/board.cmake b/boards/st/nucleo_h723zg/board.cmake index 745c70d780c..b9e6be6fda5 100644 --- a/boards/st/nucleo_h723zg/board.cmake +++ b/boards/st/nucleo_h723zg/board.cmake @@ -1,9 +1,11 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") board_runner_args(jlink "--device=STM32H723ZG" "--speed=4000") board_runner_args(openocd --target-handle=_CHIPNAME.cpu0) -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/jlink.board.cmake) -include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) diff --git a/boards/st/nucleo_h743zi/board.cmake b/boards/st/nucleo_h743zi/board.cmake index bea4b1844a1..004ae3551ce 100644 --- a/boards/st/nucleo_h743zi/board.cmake +++ b/boards/st/nucleo_h743zi/board.cmake @@ -1,12 +1,14 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") board_runner_args(openocd --cmd-post-verify "reset halt") board_runner_args(openocd --target-handle=_CHIPNAME.cpu0) board_runner_args(jlink "--device=STM32H743ZI" "--speed=4000") -board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) -include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.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 677c748de35..716e0812e71 100644 --- a/boards/st/nucleo_h745zi_q/board.cmake +++ b/boards/st/nucleo_h745zi_q/board.cmake @@ -1,6 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 # Copyright (c) 2020 Alexander Kozhinov +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") board_runner_args(jlink "--device=STM32H745ZI" "--speed=4000") if(CONFIG_BOARD_NUCLEO_H745ZI_Q_STM32H745XX_M7) board_runner_args(openocd --target-handle=_CHIPNAME.cpu0) @@ -8,5 +10,7 @@ elseif(CONFIG_BOARD_NUCLEO_H745ZI_Q_STM32H745XX_M4) board_runner_args(openocd --target-handle=_CHIPNAME.cpu1) endif() +# keep first +include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) include(${ZEPHYR_BASE}/boards/common/openocd.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 b206f9921db..aa65b88b81a 100644 --- a/boards/st/nucleo_h753zi/board.cmake +++ b/boards/st/nucleo_h753zi/board.cmake @@ -1,9 +1,11 @@ # SPDX-License-Identifier: Apache-2.0 -board_runner_args(jlink "--device=STM32H753ZI" "--speed=4000") +# keep first board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +board_runner_args(jlink "--device=STM32H753ZI" "--speed=4000") 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/jlink.board.cmake) -include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) diff --git a/boards/st/nucleo_h755zi_q/board.cmake b/boards/st/nucleo_h755zi_q/board.cmake index 826810787e2..e703f23d147 100644 --- a/boards/st/nucleo_h755zi_q/board.cmake +++ b/boards/st/nucleo_h755zi_q/board.cmake @@ -1,5 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") board_runner_args(jlink "--device=STM32H755ZI" "--speed=3300") if(CONFIG_BOARD_NUCLEO_H755ZI_Q_STM32H755XX_M7) @@ -8,6 +9,7 @@ elseif(CONFIG_BOARD_NUCLEO_H755ZI_Q_STM32H755XX_M4) board_runner_args(openocd --target-handle=_CHIPNAME.cpu1) endif() +# keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) include(${ZEPHYR_BASE}/boards/common/openocd.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 cdd8c0a0b5f..e0cb9e0aac8 100644 --- a/boards/st/nucleo_h7a3zi_q/board.cmake +++ b/boards/st/nucleo_h7a3zi_q/board.cmake @@ -1,9 +1,11 @@ # SPDX-License-Identifier: Apache-2.0 -board_runner_args(jlink "--device=STM32H7A3ZI" "--speed=4000") +# keep first board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +board_runner_args(jlink "--device=STM32H7A3ZI" "--speed=4000") 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/jlink.board.cmake) -include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) diff --git a/boards/st/nucleo_l011k4/board.cmake b/boards/st/nucleo_l011k4/board.cmake index 7c88105a59a..ed2af84d31e 100644 --- a/boards/st/nucleo_l011k4/board.cmake +++ b/boards/st/nucleo_l011k4/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_l031k6/board.cmake b/boards/st/nucleo_l031k6/board.cmake index 7451e6df477..90c28655ceb 100644 --- a/boards/st/nucleo_l031k6/board.cmake +++ b/boards/st/nucleo_l031k6/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_l053r8/board.cmake b/boards/st/nucleo_l053r8/board.cmake index 8f7ea297484..f6b83f83876 100644 --- a/boards/st/nucleo_l053r8/board.cmake +++ b/boards/st/nucleo_l053r8/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_l073rz/board.cmake b/boards/st/nucleo_l073rz/board.cmake index 5e307c7a541..bd12f7d933b 100644 --- a/boards/st/nucleo_l073rz/board.cmake +++ b/boards/st/nucleo_l073rz/board.cmake @@ -1,9 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 -board_runner_args(jlink "--device=STM32L073RZ" "--speed=4000") +# keep first board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +board_runner_args(jlink "--device=STM32L073RZ" "--speed=4000") - -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +# keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd.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 cbeaea2e456..716846e4923 100644 --- a/boards/st/nucleo_l152re/board.cmake +++ b/boards/st/nucleo_l152re/board.cmake @@ -1,3 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +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) diff --git a/boards/st/nucleo_l412rb_p/board.cmake b/boards/st/nucleo_l412rb_p/board.cmake index 5b1319aadc4..0ee007da3c5 100644 --- a/boards/st/nucleo_l412rb_p/board.cmake +++ b/boards/st/nucleo_l412rb_p/board.cmake @@ -1,7 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) - diff --git a/boards/st/nucleo_l432kc/board.cmake b/boards/st/nucleo_l432kc/board.cmake index f87a4b505b0..20c7aec7e06 100644 --- a/boards/st/nucleo_l432kc/board.cmake +++ b/boards/st/nucleo_l432kc/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_l433rc_p/board.cmake b/boards/st/nucleo_l433rc_p/board.cmake index d9f0635b48b..cabd763429f 100644 --- a/boards/st/nucleo_l433rc_p/board.cmake +++ b/boards/st/nucleo_l433rc_p/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_l452re/board.cmake b/boards/st/nucleo_l452re/board.cmake index 066106d4a19..61fc4681587 100644 --- a/boards/st/nucleo_l452re/board.cmake +++ b/boards/st/nucleo_l452re/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_l476rg/board.cmake b/boards/st/nucleo_l476rg/board.cmake index 7739c00b5e7..8dd9a438478 100644 --- a/boards/st/nucleo_l476rg/board.cmake +++ b/boards/st/nucleo_l476rg/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_l496zg/board.cmake b/boards/st/nucleo_l496zg/board.cmake index bbb63238a8d..eab553680b0 100644 --- a/boards/st/nucleo_l496zg/board.cmake +++ b/boards/st/nucleo_l496zg/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_l4a6zg/board.cmake b/boards/st/nucleo_l4a6zg/board.cmake index c268c57adae..293f2736a07 100644 --- a/boards/st/nucleo_l4a6zg/board.cmake +++ b/boards/st/nucleo_l4a6zg/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_l4r5zi/board.cmake b/boards/st/nucleo_l4r5zi/board.cmake index 0def9a56111..2d7ce04b87e 100644 --- a/boards/st/nucleo_l4r5zi/board.cmake +++ b/boards/st/nucleo_l4r5zi/board.cmake @@ -1,8 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/nucleo_l552ze_q/board.cmake b/boards/st/nucleo_l552ze_q/board.cmake index 7ec6ceb8ab9..4308af48306 100644 --- a/boards/st/nucleo_l552ze_q/board.cmake +++ b/boards/st/nucleo_l552ze_q/board.cmake @@ -1,4 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 + if(CONFIG_BUILD_WITH_TFM) set(FLASH_BASE_ADDRESS_S 0x0C000000) @@ -12,10 +13,15 @@ if(CONFIG_BUILD_WITH_TFM) endif() endif() +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") + set_ifndef(BOARD_DEBUG_RUNNER pyocd) set_ifndef(BOARD_FLASH_RUNNER pyocd) 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) diff --git a/boards/st/nucleo_u575zi_q/board.cmake b/boards/st/nucleo_u575zi_q/board.cmake index 44f3e8cbcfc..17127a40101 100644 --- a/boards/st/nucleo_u575zi_q/board.cmake +++ b/boards/st/nucleo_u575zi_q/board.cmake @@ -1,4 +1,4 @@ -board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +# keep first board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") board_runner_args(openocd "--tcl-port=6666") @@ -9,6 +9,7 @@ board_runner_args(pyocd "--target=stm32u575zitx") 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/pyocd.board.cmake) diff --git a/boards/st/nucleo_u5a5zj_q/board.cmake b/boards/st/nucleo_u5a5zj_q/board.cmake index 55861552c8e..eeef658184f 100644 --- a/boards/st/nucleo_u5a5zj_q/board.cmake +++ b/boards/st/nucleo_u5a5zj_q/board.cmake @@ -1,3 +1,4 @@ +# keep first board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") board_runner_args(openocd "--tcl-port=6666") @@ -8,6 +9,7 @@ board_runner_args(pyocd "--target=stm32u5a5zjtx") 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/pyocd.board.cmake) diff --git a/boards/st/nucleo_wb55rg/board.cmake b/boards/st/nucleo_wb55rg/board.cmake index 75762ef577e..13002e7ade4 100644 --- a/boards/st/nucleo_wb55rg/board.cmake +++ b/boards/st/nucleo_wb55rg/board.cmake @@ -1,7 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 -board_runner_args(pyocd "--target=stm32wb55rgvx") -board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +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/pyocd.board.cmake) diff --git a/boards/st/nucleo_wba52cg/board.cmake b/boards/st/nucleo_wba52cg/board.cmake index 4ad8bc417ea..9c612e9d0b0 100644 --- a/boards/st/nucleo_wba52cg/board.cmake +++ b/boards/st/nucleo_wba52cg/board.cmake @@ -1,4 +1,6 @@ +# keep first 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) diff --git a/boards/st/nucleo_wba55cg/board.cmake b/boards/st/nucleo_wba55cg/board.cmake index 4ad8bc417ea..9c612e9d0b0 100644 --- a/boards/st/nucleo_wba55cg/board.cmake +++ b/boards/st/nucleo_wba55cg/board.cmake @@ -1,4 +1,6 @@ +# keep first 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) diff --git a/boards/st/nucleo_wl55jc/board.cmake b/boards/st/nucleo_wl55jc/board.cmake index d1ca609778e..716846e4923 100644 --- a/boards/st/nucleo_wl55jc/board.cmake +++ b/boards/st/nucleo_wl55jc/board.cmake @@ -1,5 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first 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/stm32cubeprogrammer.board.cmake) \ No newline at end of file diff --git a/boards/st/steval_stwinbx1/board.cmake b/boards/st/steval_stwinbx1/board.cmake index 7b41b6115ca..1335413cee7 100644 --- a/boards/st/steval_stwinbx1/board.cmake +++ b/boards/st/steval_stwinbx1/board.cmake @@ -13,6 +13,7 @@ board_runner_args(openocd "--tcl-port=6666") board_runner_args(openocd --cmd-pre-init "gdb_report_data_abort enable") 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) diff --git a/boards/st/stm32373c_eval/board.cmake b/boards/st/stm32373c_eval/board.cmake index 8bcf43ee8c7..c4303e2c481 100644 --- a/boards/st/stm32373c_eval/board.cmake +++ b/boards/st/stm32373c_eval/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/stm32c0116_dk/board.cmake b/boards/st/stm32c0116_dk/board.cmake index 92d0dbb2924..f1142b2c248 100644 --- a/boards/st/stm32c0116_dk/board.cmake +++ b/boards/st/stm32c0116_dk/board.cmake @@ -1,8 +1,10 @@ # Copyright (c) 2024 Kickmaker # SPDX-License-Identifier: Apache-2.0 -board_runner_args(jlink "--device=STM32C011F6" "--speed=4000") +# keep first board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +board_runner_args(jlink "--device=STM32C011F6" "--speed=4000") -include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) +# keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.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 18a9499d595..f49b17d83bb 100644 --- a/boards/st/stm32f072_eval/board.cmake +++ b/boards/st/stm32f072_eval/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/stm32f072b_disco/board.cmake b/boards/st/stm32f072b_disco/board.cmake index b255d56ff7d..136bd345f6a 100644 --- a/boards/st/stm32f072b_disco/board.cmake +++ b/boards/st/stm32f072b_disco/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/stm32f0_disco/board.cmake b/boards/st/stm32f0_disco/board.cmake index d0af9581843..d36f83beb8f 100644 --- a/boards/st/stm32f0_disco/board.cmake +++ b/boards/st/stm32f0_disco/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/stm32f3_disco/board.cmake b/boards/st/stm32f3_disco/board.cmake index 0c02b470bd7..553a53bf9ce 100644 --- a/boards/st/stm32f3_disco/board.cmake +++ b/boards/st/stm32f3_disco/board.cmake @@ -1,8 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 -board_runner_args(jlink "--device=STM32F303VC" "--speed=4000") +# keep first board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +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/jlink.board.cmake) -include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) diff --git a/boards/st/stm32f411e_disco/board.cmake b/boards/st/stm32f411e_disco/board.cmake index a14479cec5f..b0408356c87 100644 --- a/boards/st/stm32f411e_disco/board.cmake +++ b/boards/st/stm32f411e_disco/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/stm32f412g_disco/board.cmake b/boards/st/stm32f412g_disco/board.cmake index 8b2cd0fca43..be8b35e82c8 100644 --- a/boards/st/stm32f412g_disco/board.cmake +++ b/boards/st/stm32f412g_disco/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/stm32f429i_disc1/board.cmake b/boards/st/stm32f429i_disc1/board.cmake index a175073a035..9f872edd546 100644 --- a/boards/st/stm32f429i_disc1/board.cmake +++ b/boards/st/stm32f429i_disc1/board.cmake @@ -1,12 +1,14 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") board_runner_args(jlink "--device=STM32F429ZI" "--speed=4000") board_runner_args(pyocd "--target=stm32f429xi") board_runner_args(pyocd "--flash-opt=-O reset_type=hw") board_runner_args(pyocd "--flash-opt=-O connect_mode=under-reset") -include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) +# keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) +include(${ZEPHYR_BASE}/boards/common/openocd.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 8a8885e9a95..327c95da4fa 100644 --- a/boards/st/stm32f469i_disco/board.cmake +++ b/boards/st/stm32f469i_disco/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/stm32f4_disco/board.cmake b/boards/st/stm32f4_disco/board.cmake index 060c7457c73..a2c5eefa38c 100644 --- a/boards/st/stm32f4_disco/board.cmake +++ b/boards/st/stm32f4_disco/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/stm32f723e_disco/board.cmake b/boards/st/stm32f723e_disco/board.cmake index e5ef74a91e7..7a99727f266 100644 --- a/boards/st/stm32f723e_disco/board.cmake +++ b/boards/st/stm32f723e_disco/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/stm32f746g_disco/board.cmake b/boards/st/stm32f746g_disco/board.cmake index bbc3ee782d1..038a5d7e806 100644 --- a/boards/st/stm32f746g_disco/board.cmake +++ b/boards/st/stm32f746g_disco/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/stm32f7508_dk/board.cmake b/boards/st/stm32f7508_dk/board.cmake index b81e563d0c2..83aae9337d6 100644 --- a/boards/st/stm32f7508_dk/board.cmake +++ b/boards/st/stm32f7508_dk/board.cmake @@ -1,7 +1,11 @@ # Copyright (c) 2022, Rtone. # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/stm32f769i_disco/board.cmake b/boards/st/stm32f769i_disco/board.cmake index 819c5aba81b..6df48aa7403 100644 --- a/boards/st/stm32f769i_disco/board.cmake +++ b/boards/st/stm32f769i_disco/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/stm32g0316_disco/board.cmake b/boards/st/stm32g0316_disco/board.cmake index 43e18743801..30495593070 100644 --- a/boards/st/stm32g0316_disco/board.cmake +++ b/boards/st/stm32g0316_disco/board.cmake @@ -1,9 +1,12 @@ # SPDX-License-Identifier: Apache-2.0 -board_runner_args(pyocd "--target=stm32g031j6mx") + +# keep first board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +board_runner_args(pyocd "--target=stm32g031j6mx") 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/pyocd.board.cmake) include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) -include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) diff --git a/boards/st/stm32g071b_disco/board.cmake b/boards/st/stm32g071b_disco/board.cmake index b315703cd96..b77e3f43c2f 100644 --- a/boards/st/stm32g071b_disco/board.cmake +++ b/boards/st/stm32g071b_disco/board.cmake @@ -1,6 +1,7 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +# keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) - diff --git a/boards/st/stm32g081b_eval/board.cmake b/boards/st/stm32g081b_eval/board.cmake index b315703cd96..b77e3f43c2f 100644 --- a/boards/st/stm32g081b_eval/board.cmake +++ b/boards/st/stm32g081b_eval/board.cmake @@ -1,6 +1,7 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +# keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) - diff --git a/boards/st/stm32h573i_dk/board.cmake b/boards/st/stm32h573i_dk/board.cmake index ec3b6dacdc1..f1a703cda64 100644 --- a/boards/st/stm32h573i_dk/board.cmake +++ b/boards/st/stm32h573i_dk/board.cmake @@ -1,5 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first if(CONFIG_STM32_MEMMAP) board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") board_runner_args(stm32cubeprogrammer "--extload=MX25LM51245G_STM32H573I-DK-RevB-SFIx.stldr") @@ -13,6 +14,7 @@ board_runner_args(openocd "--tcl-port=6666") board_runner_args(openocd --cmd-pre-init "gdb_report_data_abort enable") board_runner_args(openocd "--no-halt") +# 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) diff --git a/boards/st/stm32h735g_disco/board.cmake b/boards/st/stm32h735g_disco/board.cmake index b4beb22525d..ef05a214927 100644 --- a/boards/st/stm32h735g_disco/board.cmake +++ b/boards/st/stm32h735g_disco/board.cmake @@ -1,8 +1,12 @@ # SPDX-License-Identifier: Apache-2.0 # Copyright (c) 2021 SILA Embedded Solutions GmbH +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") board_runner_args(jlink "--device=STM32H735IG" "--speed=4000") 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/jlink.board.cmake) diff --git a/boards/st/stm32h745i_disco/board.cmake b/boards/st/stm32h745i_disco/board.cmake index d52fff882b7..ae99e34ce51 100644 --- a/boards/st/stm32h745i_disco/board.cmake +++ b/boards/st/stm32h745i_disco/board.cmake @@ -2,6 +2,14 @@ # Copyright (c) 2020 Alexander Kozhinov # Copyright (c) 2024 Tomas Jurena +# keep first +if(CONFIG_STM32_MEMMAP) +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +board_runner_args(stm32cubeprogrammer "--extload=MT25TL01G_STM32H745I-DISCO.stldr") +else() +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +endif() + board_runner_args(jlink "--device=STM32H745XI" "--speed=4000") if(CONFIG_BOARD_STM32H745I_DISCO_STM32H745XX_M7) board_runner_args(openocd --target-handle=_CHIPNAME.cpu0) @@ -9,13 +17,7 @@ elseif(CONFIG_BOARD_STM32H745I_DISCO_STM32H745XX_M4) board_runner_args(openocd --target-handle=_CHIPNAME.cpu1) endif() -if(CONFIG_STM32_MEMMAP) -board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") -board_runner_args(stm32cubeprogrammer "--extload=MT25TL01G_STM32H745I-DISCO.stldr") -else() -board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") -endif() - +# keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) include(${ZEPHYR_BASE}/boards/common/openocd.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 cffd0a071e9..6b22ac50217 100644 --- a/boards/st/stm32h747i_disco/board.cmake +++ b/boards/st/stm32h747i_disco/board.cmake @@ -1,6 +1,14 @@ # SPDX-License-Identifier: Apache-2.0 # Copyright (c) 2019 STMicroelectronics +# keep first +if(CONFIG_STM32_MEMMAP) +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +board_runner_args(stm32cubeprogrammer "--extload=MT25TL01G_STM32H747I-DISCO.stldr") +else() +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +endif() + if(CONFIG_BOARD_STM32H747I_DISCO_STM32H747XX_M7) board_runner_args(jlink "--device=STM32H747ZI_M7") board_runner_args(openocd "--config=${BOARD_DIR}/support/openocd_stm32h747i_disco_m7.cfg") @@ -11,13 +19,7 @@ elseif(CONFIG_BOARD_STM32H747I_DISCO_STM32H747XX_M4) board_runner_args(openocd --target-handle=_CHIPNAME.cpu1) endif() -if(CONFIG_STM32_MEMMAP) -board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") -board_runner_args(stm32cubeprogrammer "--extload=MT25TL01G_STM32H747I-DISCO.stldr") -else() -board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") -endif() - +# keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) include(${ZEPHYR_BASE}/boards/common/openocd.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 b9fb74f99cf..479fe1abc2e 100644 --- a/boards/st/stm32h750b_dk/board.cmake +++ b/boards/st/stm32h750b_dk/board.cmake @@ -1,8 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -board_runner_args(jlink "--device=STM32H735IG" "--speed=4000") -board_runner_args(openocd --target-handle=_CHIPNAME.cpu0) - +# keep first if(CONFIG_STM32_MEMMAP) board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") board_runner_args(stm32cubeprogrammer "--extload=MT25TL01G_STM32H750B-DISCO.stldr") @@ -10,6 +8,10 @@ else() board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw" ) endif() +board_runner_args(jlink "--device=STM32H735IG" "--speed=4000") +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/jlink.board.cmake) diff --git a/boards/st/stm32h7b3i_dk/board.cmake b/boards/st/stm32h7b3i_dk/board.cmake index 71ce6d59e43..88f340c9331 100644 --- a/boards/st/stm32h7b3i_dk/board.cmake +++ b/boards/st/stm32h7b3i_dk/board.cmake @@ -1,9 +1,7 @@ # Copyright (c) 2022 Byte-Lab d.o.o. # SPDX-License-Identifier: Apache-2.0 -board_runner_args(jlink "--device=STM32H7B3LI" "--speed=4000") -board_runner_args(openocd --target-handle=_CHIPNAME.cpu0) - +# keep first if(CONFIG_STM32_MEMMAP) board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") board_runner_args(stm32cubeprogrammer "--extload=MX25LM51245G_STM32H7B3I-DISCO.stldr") @@ -11,6 +9,10 @@ else() board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw" ) endif() +board_runner_args(jlink "--device=STM32H7B3LI" "--speed=4000") +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/jlink.board.cmake) diff --git a/boards/st/stm32h7s78_dk/board.cmake b/boards/st/stm32h7s78_dk/board.cmake index 585770c48b4..79bb6fcc70b 100644 --- a/boards/st/stm32h7s78_dk/board.cmake +++ b/boards/st/stm32h7s78_dk/board.cmake @@ -1,8 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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) diff --git a/boards/st/stm32l1_disco/board.cmake b/boards/st/stm32l1_disco/board.cmake index 6a1eecb756b..c8967fe8139 100644 --- a/boards/st/stm32l1_disco/board.cmake +++ b/boards/st/stm32l1_disco/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/stm32l476g_disco/board.cmake b/boards/st/stm32l476g_disco/board.cmake index e0f8d547525..76b5877ddfe 100644 --- a/boards/st/stm32l476g_disco/board.cmake +++ b/boards/st/stm32l476g_disco/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/stm32l496g_disco/board.cmake b/boards/st/stm32l496g_disco/board.cmake index b8a1001ba60..b6f4be86151 100644 --- a/boards/st/stm32l496g_disco/board.cmake +++ b/boards/st/stm32l496g_disco/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/stm32l4r9i_disco/board.cmake b/boards/st/stm32l4r9i_disco/board.cmake index c88ae7d0783..ea87b4f9548 100644 --- a/boards/st/stm32l4r9i_disco/board.cmake +++ b/boards/st/stm32l4r9i_disco/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/stm32l562e_dk/board.cmake b/boards/st/stm32l562e_dk/board.cmake index 479f8dcc036..15e7afc15c0 100644 --- a/boards/st/stm32l562e_dk/board.cmake +++ b/boards/st/stm32l562e_dk/board.cmake @@ -12,10 +12,11 @@ if(CONFIG_BUILD_WITH_TFM) endif() endif() - -board_runner_args(pyocd "--target=stm32l562qeixq") +# keep first board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +board_runner_args(pyocd "--target=stm32l562qeixq") -include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake) +# 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) diff --git a/boards/st/stm32u5a9j_dk/board.cmake b/boards/st/stm32u5a9j_dk/board.cmake index ac9a18d42fb..5bb38a1d9c6 100644 --- a/boards/st/stm32u5a9j_dk/board.cmake +++ b/boards/st/stm32u5a9j_dk/board.cmake @@ -1,11 +1,13 @@ # Copyright (c) 2023 STMicroelectronics # SPDX-License-Identifier: Apache-2.0 +# keep first board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") board_runner_args(openocd "--tcl-port=6666") board_runner_args(openocd --cmd-pre-init "gdb_report_data_abort enable") board_runner_args(openocd "--no-halt") +# keep first include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake) include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake) diff --git a/boards/st/stm32vl_disco/board.cmake b/boards/st/stm32vl_disco/board.cmake index d03ace4d57d..7d5a94fd80f 100644 --- a/boards/st/stm32vl_disco/board.cmake +++ b/boards/st/stm32vl_disco/board.cmake @@ -1,6 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") 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/jlink.board.cmake) diff --git a/boards/st/stm32wb5mm_dk/board.cmake b/boards/st/stm32wb5mm_dk/board.cmake index 47fc12f1308..5220869e9f0 100644 --- a/boards/st/stm32wb5mm_dk/board.cmake +++ b/boards/st/stm32wb5mm_dk/board.cmake @@ -1,7 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 -board_runner_args(pyocd "--target=stm32wb55vgyx") -board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +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/pyocd.board.cmake) diff --git a/boards/st/stm32wb5mmg/board.cmake b/boards/st/stm32wb5mmg/board.cmake index 47fc12f1308..5220869e9f0 100644 --- a/boards/st/stm32wb5mmg/board.cmake +++ b/boards/st/stm32wb5mmg/board.cmake @@ -1,7 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 -board_runner_args(pyocd "--target=stm32wb55vgyx") -board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +# keep first +board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") +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/pyocd.board.cmake)