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 <marek@metelski.dev>
23 lines
594 B
CMake
23 lines
594 B
CMake
# SPDX-License-Identifier: Apache-2.0
|
|
|
|
board_set_flasher_ifnset(openocd)
|
|
board_set_debugger_ifnset(openocd)
|
|
|
|
# "load_image" or "flash write_image erase"?
|
|
if(CONFIG_X86 OR CONFIG_ARC)
|
|
set_ifndef(OPENOCD_USE_LOAD_IMAGE YES)
|
|
endif()
|
|
if(OPENOCD_USE_LOAD_IMAGE)
|
|
set_ifndef(OPENOCD_FLASH load_image)
|
|
else()
|
|
set_ifndef(OPENOCD_FLASH "flash write_image erase")
|
|
endif()
|
|
|
|
set(OPENOCD_CMD_LOAD_DEFAULT "${OPENOCD_FLASH}")
|
|
set(OPENOCD_CMD_VERIFY_DEFAULT "verify_image")
|
|
|
|
board_finalize_runner_args(openocd
|
|
--cmd-load "${OPENOCD_CMD_LOAD_DEFAULT}"
|
|
--cmd-verify "${OPENOCD_CMD_VERIFY_DEFAULT}"
|
|
)
|