mirror of
https://github.com/zephyrproject-rtos/zephyr
synced 2025-09-13 17:21:56 +00:00
f0346bfac0
The old way of constructing FLASH_SCRIPT_ENV_VARS was corrupting the values that were passed to the flasher. This new method is the standard way of creating a dictionary/hashmap in CMake and does not suffer from the same problem. This fixes https://github.com/zephyrproject-rtos/zephyr/issues/4844#event-1334599401 Signed-off-by: Sebastian Boe <sebastian.boe@nordicsemi.no>
28 lines
751 B
CMake
28 lines
751 B
CMake
if(DEFINED ENV{ZEPHYR_FLASH_OVER_DFU})
|
|
set(FLASH_SCRIPT dfuutil.sh)
|
|
|
|
set(DFUUTIL_PID 8087:0aba)
|
|
set(DFUUTIL_ALT x86_app)
|
|
set(DFUUTIL_IMG ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME})
|
|
|
|
set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
|
|
DFUUTIL_PID
|
|
DFUUTIL_ALT
|
|
DFUUTIL_IMG
|
|
)
|
|
else()
|
|
set(FLASH_SCRIPT openocd.sh)
|
|
endif()
|
|
|
|
set(DEBUG_SCRIPT openocd.sh)
|
|
|
|
set(OPENOCD_PRE_CMD "targets 1")
|
|
set(OPENOCD_LOAD_CMD "load_image ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME} ${CONFIG_FLASH_BASE_ADDRESS}")
|
|
set(OPENOCD_VERIFY_CMD "verify_image ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME} ${CONFIG_FLASH_BASE_ADDRESS}")
|
|
|
|
set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
|
|
OPENOCD_PRE_CMD
|
|
OPENOCD_LOAD_CMD
|
|
OPENOCD_VERIFY_CMD
|
|
)
|