flash: Change type of FLASH_SCRIPT_ENV_VARS

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>

boards/arc/arduino_101_sss/board.cmake

@@ -1,10 +1,14 @@
 if(DEFINED ENV{ZEPHYR_FLASH_OVER_DFU})
   set(FLASH_SCRIPT dfuutil.sh)
 
+  set(DFUUTIL_PID 8087:0aba)
+  set(DFUUTIL_ALT sensor_core)
+  set(DFUUTIL_IMG ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME})
+
   set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
-    DFUUTIL_PID=8087:0aba
+    DFUUTIL_PID
-    DFUUTIL_ALT=sensor_core
+    DFUUTIL_ALT
-    DFUUTIL_IMG=${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME}
+    DFUUTIL_IMG
     )
 else()
   set(FLASH_SCRIPT openocd.sh)
@@ -12,9 +16,14 @@ 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(GDB_PORT 3334)
+
 set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
-  OPENOCD_PRE_CMD="targets 1"
+  OPENOCD_PRE_CMD
-  OPENOCD_LOAD_CMD="load_image     ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME} ${CONFIG_FLASH_BASE_ADDRESS}"
+  OPENOCD_LOAD_CMD
-  OPENOCD_VERIFY_CMD="verify_image ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME} ${CONFIG_FLASH_BASE_ADDRESS}"
+  OPENOCD_VERIFY_CMD
-  GDB_PORT=3334
+  GDB_PORT
   )

boards/arc/em_starterkit/board.cmake

@@ -1,7 +1,10 @@
 set(FLASH_SCRIPT arc_debugger.sh)
 set(DEBUG_SCRIPT arc_debugger.sh)
 
+set(OPENOCD_LOAD_CMD "load_image     ${PROJECT_BINARY_DIR}/${KERNEL_ELF_NAME} ${CONFIG_FLASH_BASE_ADDRESS}")
+set(OPENOCD_VERIFY_CMD "verify_image ${PROJECT_BINARY_DIR}/${KERNEL_ELF_NAME} ${CONFIG_FLASH_BASE_ADDRESS}")
+
 set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
-  OPENOCD_LOAD_CMD="load_image     ${PROJECT_BINARY_DIR}/${KERNEL_ELF_NAME} ${CONFIG_FLASH_BASE_ADDRESS}"
+  OPENOCD_LOAD_CMD
-  OPENOCD_VERIFY_CMD="verify_image ${PROJECT_BINARY_DIR}/${KERNEL_ELF_NAME} ${CONFIG_FLASH_BASE_ADDRESS}"
+  OPENOCD_VERIFY_CMD
   )

boards/arc/panther_ss/board.cmake

@@ -1,5 +1,7 @@
 include($ENV{ZEPHYR_BASE}/boards/common/openocd.board.cmake)
 
+set(OPENOCD_PRE_CMD "targets 1")
+
 set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
-  OPENOCD_PRE_CMD="targets 1"
+  OPENOCD_PRE_CMD
   )

boards/arc/quark_se_c1000_ss_devboard/board.cmake

@@ -1,5 +1,7 @@
 include($ENV{ZEPHYR_BASE}/boards/common/openocd.board.cmake)
 
+set(OPENOCD_PRE_CMD "targets 1")
+
 set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
-  OPENOCD_PRE_CMD="targets 1"
+  OPENOCD_PRE_CMD
   )

boards/arm/96b_carbon/board.cmake

@@ -1,8 +1,13 @@
 set(FLASH_SCRIPT dfuutil.sh)
 
+set(DFUUTIL_PID 0483:df11)
+set(DFUUTIL_ALT 0)
+set(DFUUTIL_IMG ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME})
+set(DFUUTIL_DFUSE_ADDR ${CONFIG_FLASH_BASE_ADDRESS})
+
 set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
-  DFUUTIL_PID=0483:df11
+  DFUUTIL_PID
-  DFUUTIL_ALT=0
+  DFUUTIL_ALT
-  DFUUTIL_IMG=${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME}
+  DFUUTIL_IMG
-  DFUUTIL_DFUSE_ADDR=${CONFIG_FLASH_BASE_ADDRESS}
+  DFUUTIL_DFUSE_ADDR
   )

boards/arm/96b_nitrogen/board.cmake

@@ -1,6 +1,8 @@
 set(FLASH_SCRIPT pyocd.sh)
 set(DEBUG_SCRIPT pyocd.sh)
 
+set(PYOCD_TARGET nrf52)
+
 set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
-  PYOCD_TARGET=nrf52
+  PYOCD_TARGET
   )

boards/arm/arduino_101_ble/board.cmake

@@ -1,9 +1,13 @@
 if(DEFINED ENV{ZEPHYR_FLASH_OVER_DFU})
   set(FLASH_SCRIPT dfuutil.sh)
 
+  set(DFUUTIL_PID 8087:0aba)
+  set(DFUUTIL_ALT ble_core)
+  set(DFUUTIL_IMG ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME})
+
   set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
-    DFUUTIL_PID=8087:0aba
+    DFUUTIL_PID
-    DFUUTIL_ALT=ble_core
+    DFUUTIL_ALT
-    DFUUTIL_IMG=${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME}
+    DFUUTIL_IMG
     )
 endif()

boards/arm/bbc_microbit/board.cmake

@@ -1,6 +1,8 @@
 set(FLASH_SCRIPT pyocd.sh)
 set(DEBUG_SCRIPT pyocd.sh)
 
+set(PYOCD_TARGET nrf51)
+
 set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
-  PYOCD_TARGET=nrf51
+  PYOCD_TARGET
   )

boards/arm/frdm_k64f/board.cmake

@@ -7,9 +7,14 @@ elseif(OPENSDA_FW STREQUAL daplink)
   set_ifndef(FLASH_SCRIPT pyocd.sh)
 endif()
 
+set(JLINK_DEVICE MK64FN1M0xxx12)
+set(PYOCD_TARGET k64f)
+set(OPENOCD_LOAD_CMD "flash write_image erase ${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
-  JLINK_DEVICE=MK64FN1M0xxx12
+  JLINK_DEVICE
-  PYOCD_TARGET=k64f
+  PYOCD_TARGET
-  OPENOCD_LOAD_CMD="flash write_image erase ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME} ${CONFIG_FLASH_BASE_ADDRESS}"
+  OPENOCD_LOAD_CMD
-  OPENOCD_VERIFY_CMD="verify_image          ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME} ${CONFIG_FLASH_BASE_ADDRESS}"
+  OPENOCD_VERIFY_CMD
   )

boards/arm/frdm_kl25z/board.cmake

@@ -7,7 +7,10 @@ elseif(OPENSDA_FW STREQUAL daplink)
   set_ifndef(FLASH_SCRIPT pyocd.sh)
 endif()
 
+set(JLINK_DEVICE MKL25Z128xxx4)
+set(PYOCD_TARGET kl25z)
+
 set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
-  JLINK_DEVICE=MKL25Z128xxx4
+  JLINK_DEVICE
-  PYOCD_TARGET=kl25z
+  PYOCD_TARGET
   )

boards/arm/frdm_kw41z/board.cmake

@@ -7,7 +7,10 @@ elseif(OPENSDA_FW STREQUAL daplink)
   set_ifndef(FLASH_SCRIPT pyocd.sh)
 endif()
 
+set(JLINK_DEVICE MKW41Z512xxx4)
+set(PYOCD_TARGET kw41z4)
+
 set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
-  JLINK_DEVICE=MKW41Z512xxx4
+  JLINK_DEVICE
-  PYOCD_TARGET=kw41z4
+  PYOCD_TARGET
   )

boards/arm/hexiwear_k64/board.cmake

@@ -7,7 +7,10 @@ elseif(OPENSDA_FW STREQUAL daplink)
   set_ifndef(FLASH_SCRIPT pyocd.sh)
 endif()
 
+set(JLINK_DEVICE MK64FN1M0xxx12)
+set(PYOCD_TARGET k64f)
+
 set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
-  JLINK_DEVICE=MK64FN1M0xxx12
+  JLINK_DEVICE
-  PYOCD_TARGET=k64f
+  PYOCD_TARGET
   )

boards/arm/hexiwear_kw40z/board.cmake

@@ -7,7 +7,10 @@ elseif(OPENSDA_FW STREQUAL daplink)
   set_ifndef(FLASH_SCRIPT pyocd.sh)
 endif()
 
+set(JLINK_DEVICE MKW40Z160xxx4)
+set(PYOCD_TARGET kw40z4)
+
 set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
-  JLINK_DEVICE=MKW40Z160xxx4
+  JLINK_DEVICE
-  PYOCD_TARGET=kw40z4
+  PYOCD_TARGET
   )

boards/arm/nrf51_pca10028/board.cmake

@@ -1,4 +1,7 @@
 set(FLASH_SCRIPT nrf_flash.sh)
+
+set(NRF_FAMILY NRF51)
+
 set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
-  NRF_FAMILY=NRF51
+  NRF_FAMILY
   )

boards/arm/nrf51_vbluno51/board.cmake

@@ -1,6 +1,8 @@
 set(FLASH_SCRIPT pyocd.sh)
 set(DEBUG_SCRIPT pyocd.sh)
 
+set(PYOCD_TARGET nrf51)
+
 set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
-  PYOCD_TARGET=nrf51
+  PYOCD_TARGET
   )

boards/arm/nrf52840_pca10056/board.cmake

@@ -1,4 +1,6 @@
 set(FLASH_SCRIPT nrf_flash.sh)
+set(NRF_FAMILY NRF52)
+
 set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
-  NRF_FAMILY=NRF52
+  NRF_FAMILY
   )

boards/arm/nrf52_blenano2/board.cmake

@@ -1,6 +1,8 @@
 set(FLASH_SCRIPT pyocd.sh)
 set(DEBUG_SCRIPT pyocd.sh)
 
+set(PYOCD_TARGET nrf52)
+
 set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
-  PYOCD_TARGET=nrf52
+  PYOCD_TARGET
   )

boards/arm/nrf52_pca10040/board.cmake

@@ -1,4 +1,7 @@
 set(FLASH_SCRIPT nrf_flash.sh)
+
+set(NRF_FAMILY NRF52)
+
 set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
-  NRF_FAMILY=NRF52
+  NRF_FAMILY
   )

boards/arm/nrf52_vbluno52/board.cmake

@@ -1,6 +1,8 @@
 set(FLASH_SCRIPT pyocd.sh)
 set(DEBUG_SCRIPT pyocd.sh)
 
+set(PYOCD_TARGET nrf52)
+
 set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
-  PYOCD_TARGET=nrf52
+  PYOCD_TARGET
   )

boards/arm/olimexino_stm32/board.cmake

@@ -3,7 +3,10 @@ set(DEBUG_SCRIPT openocd.sh)
 
 set(FLASH_BASE_ADDRESS 0x08000000)
 
+set(OPENOCD_LOAD_CMD "flash write_image erase ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME} ${FLASH_BASE_ADDRESS}")
+set(OPENOCD_VERIFY_CMD "verify_image          ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME} ${FLASH_BASE_ADDRESS}")
+
 set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
-  OPENOCD_LOAD_CMD="flash write_image erase ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME} ${FLASH_BASE_ADDRESS}"
+  OPENOCD_LOAD_CMD
-  OPENOCD_VERIFY_CMD="verify_image          ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME} ${FLASH_BASE_ADDRESS}"
+  OPENOCD_VERIFY_CMD
   )

boards/arm/sam_e70_xplained/board.cmake

@@ -1,5 +1,7 @@
 include($ENV{ZEPHYR_BASE}/boards/common/openocd.board.cmake)
 
+set(OPENOCD_POST_CMD "atsamv gpnvm set 1")
+
 set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
-  OPENOCD_POST_CMD="atsamv gpnvm set 1"
+  OPENOCD_POST_CMD
   )

boards/arm/usb_kw24d512/board.cmake

@@ -1,5 +1,7 @@
 set(DEBUG_SCRIPT jlink.sh)
 
+set(JLINK_DEVICE MKW24D512xxx5)
+
 set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
-  JLINK_DEVICE=MKW24D512xxx5
+  JLINK_DEVICE
   )

boards/common/openocd.board.cmake

@@ -1,7 +1,10 @@
 set(FLASH_SCRIPT openocd.sh)
 set(DEBUG_SCRIPT openocd.sh)
 
+set(OPENOCD_LOAD_CMD   "flash write_image erase ${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_LOAD_CMD="flash write_image erase ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME} ${CONFIG_FLASH_BASE_ADDRESS}"
+  OPENOCD_LOAD_CMD
-  OPENOCD_VERIFY_CMD="verify_image          ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME} ${CONFIG_FLASH_BASE_ADDRESS}"
+  OPENOCD_VERIFY_CMD
   )

boards/x86/arduino_101/board.cmake

@@ -1,10 +1,14 @@
 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=8087:0aba
+    DFUUTIL_PID
-    DFUUTIL_ALT=x86_app
+    DFUUTIL_ALT
-    DFUUTIL_IMG=${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME}
+    DFUUTIL_IMG
     )
 else()
   set(FLASH_SCRIPT openocd.sh)
@@ -12,8 +16,12 @@ 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="targets 1"
+  OPENOCD_PRE_CMD
-  OPENOCD_LOAD_CMD="load_image     ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME} ${CONFIG_FLASH_BASE_ADDRESS}"
+  OPENOCD_LOAD_CMD
-  OPENOCD_VERIFY_CMD="verify_image ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME} ${CONFIG_FLASH_BASE_ADDRESS}"
+  OPENOCD_VERIFY_CMD
   )

boards/x86/panther/board.cmake

@@ -1,8 +1,12 @@
 set(FLASH_SCRIPT openocd.sh)
 set(DEBUG_SCRIPT openocd.sh)
 
+set(OPENOCD_PRE_CMD "targets 1")
+set(OPENOCD_LOAD_CMD "load_image     ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME} ${CONFIG_PHYS_LOAD_ADDR}")
+set(OPENOCD_VERIFY_CMD "verify_image ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME} ${CONFIG_PHYS_LOAD_ADDR}")
+
 set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
-  OPENOCD_PRE_CMD="targets 1"
+  OPENOCD_PRE_CMD
-  OPENOCD_LOAD_CMD="load_image     ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME} ${CONFIG_PHYS_LOAD_ADDR}"
+  OPENOCD_LOAD_CMD
-  OPENOCD_VERIFY_CMD="verify_image ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME} ${CONFIG_PHYS_LOAD_ADDR}"
+  OPENOCD_VERIFY_CMD
   )

boards/x86/quark_se_c1000_devboard/board.cmake

@@ -1,5 +1,7 @@
 include($ENV{ZEPHYR_BASE}/boards/common/openocd.board.cmake)
 
+set(OPENOCD_PRE_CMD "targets 1")
+
 set_property(GLOBAL APPEND PROPERTY FLASH_SCRIPT_ENV_VARS
-  OPENOCD_PRE_CMD="targets 1"
+  OPENOCD_PRE_CMD
   )

boards/x86/tinytile/board.cmake

@@ -1,10 +1,14 @@
 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=8087:0aba
+    DFUUTIL_PID
-    DFUUTIL_ALT=x86_app
+    DFUUTIL_ALT
-    DFUUTIL_IMG=${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME}
+    DFUUTIL_IMG
     )
 else()
   set(FLASH_SCRIPT openocd.sh)
@@ -12,8 +16,12 @@ 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="targets 1"
+  OPENOCD_PRE_CMD
-  OPENOCD_LOAD_CMD="load_image     ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME} ${CONFIG_FLASH_BASE_ADDRESS}"
+  OPENOCD_LOAD_CMD
-  OPENOCD_VERIFY_CMD="verify_image ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME} ${CONFIG_FLASH_BASE_ADDRESS}"
+  OPENOCD_VERIFY_CMD
   )

cmake/flash/CMakeLists.txt

@@ -1,5 +1,13 @@
 get_property(ENV_VARS GLOBAL PROPERTY FLASH_SCRIPT_ENV_VARS)
-list(APPEND ENV_VARS
+
+set(ENV_VARS_FORMATTED "")
+foreach(env_var ${ENV_VARS})
+  list(APPEND ENV_VARS_FORMATTED
+    ${env_var}=${${env_var}}
+    )
+endforeach()
+
+list(APPEND ENV_VARS_FORMATTED
                 O=${PROJECT_BINARY_DIR}
   KERNEL_ELF_NAME=${KERNEL_ELF_NAME}
   KERNEL_HEX_NAME=${KERNEL_HEX_NAME}
@@ -31,7 +39,7 @@ foreach(target flash debug debugserver)
   if(script)
     set(cmd
       ${CMAKE_COMMAND} -E env
-      ${ENV_VARS}
+      ${ENV_VARS_FORMATTED}
       ${PYTHON_EXECUTABLE}
       $ENV{ZEPHYR_BASE}/scripts/support/zephyr_flash_debug.py
       ${target}