mirror of
https://github.com/zephyrproject-rtos/zephyr
synced 2025-09-15 13:51:56 +00:00
The current method of setting the openocd runner arguments works for direct invocation from the command line, but the values that are written to the CMake cache are not properly separated and are difficult to parse, due to the fact that in several cases, option values contain spaces. Adjust these runner arguments so that the options and their values are separate list items. This makes it possible to parse them accurately from the CMake cache. No functional changes. Signed-off-by: Marti Bolivar <marti@opensourcefoundries.com>
27 lines
847 B
CMake
27 lines
847 B
CMake
set_ifndef(BOARD_FLASH_RUNNER openocd)
|
|
set_ifndef(BOARD_DEBUG_RUNNER 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()
|
|
|
|
# zephyr.bin, or something else?
|
|
set_ifndef(OPENOCD_IMAGE "${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME}")
|
|
|
|
# CONFIG_FLASH_BASE_ADDRESS, or something else?
|
|
set_ifndef(OPENOCD_ADDRESS "${CONFIG_FLASH_BASE_ADDRESS}")
|
|
|
|
set(OPENOCD_CMD_LOAD_DEFAULT "${OPENOCD_FLASH} ${OPENOCD_IMAGE} ${OPENOCD_ADDRESS}")
|
|
set(OPENOCD_CMD_VERIFY_DEFAULT "verify_image ${OPENOCD_IMAGE} ${OPENOCD_ADDRESS}")
|
|
|
|
board_finalize_runner_args(openocd
|
|
--cmd-load "${OPENOCD_CMD_LOAD_DEFAULT}"
|
|
--cmd-verify "${OPENOCD_CMD_VERIFY_DEFAULT}"
|
|
)
|