idf.py build & flash tool

Generate flasher args files & .json project info file as part of cmake build

components/esptool_py/CMakeLists.txt

@@ -1,10 +1,9 @@
 register_config_only_component()
 
+# Generate pre-canned flasher args files suitable for passing to esptool.py
+foreach(part project app bootloader)
 configure_file(
-  "${CMAKE_CURRENT_LIST_DIR}/flash_project_args.in"
-  "${CMAKE_BINARY_DIR}/flash_project_args"
+  "${CMAKE_CURRENT_LIST_DIR}/flash_${part}_args.in"
+  "${CMAKE_BINARY_DIR}/flash_${part}_args"
   )
-if(CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION)
-  file_append_line(${CMAKE_BINARY_DIR}/flash_project_args
-    "${CONFIG_PHY_DATA_OFFSET} esp32/phy_init_data.bin")
-endif()
+endforeach()

components/esptool_py/flash_app_args.in

@@ -0,0 +1,4 @@
+--flash_mode ${ESPFLASHMODE}
+--flash_size ${ESPFLASHSIZE}
+--flash_freq ${ESPFLASHFREQ}
+${CONFIG_APP_OFFSET} ${PROJECT_NAME}.bin

components/esptool_py/flash_bootloader_args.in

@@ -0,0 +1,4 @@
+--flash_mode ${ESPFLASHMODE}
+--flash_size ${ESPFLASHSIZE}
+--flash_freq ${ESPFLASHFREQ}
+0x1000 bootloader/bootloader.bin

components/esptool_py/flash_partition_table_args.in

@@ -0,0 +1,4 @@
+--flash_mode ${ESPFLASHMODE}
+--flash_size ${ESPFLASHSIZE}
+--flash_freq ${ESPFLASHFREQ}
+0x8000 partition_table/partition-table.bin

components/esptool_py/flash_project_args.in

@@ -1,3 +1,7 @@
+--flash_mode ${ESPFLASHMODE}
+--flash_size ${ESPFLASHSIZE}
+--flash_freq ${ESPFLASHFREQ}
 0x1000 bootloader/bootloader.bin
 0x8000 partition_table/partition-table.bin
-${CONFIG_APP_OFFSET} ${PROJECT_NAME}.elf
+${CONFIG_APP_OFFSET} ${PROJECT_NAME}.bin
+${PHY_PARTITION_OFFSET} ${PHY_PARTITION_BIN_FILE}

components/esptool_py/project_include.cmake

@@ -1,48 +1,49 @@
 # Set some global esptool.py variables
+#
+# Many of these are read when generating flash_app_args & flash_project_args
 set(ESPTOOLPY "${PYTHON}" "${CMAKE_CURRENT_LIST_DIR}/esptool/esptool.py" --chip esp32)
 set(ESPSECUREPY "${PYTHON}" "${CMAKE_CURRENT_LIST_DIR}/esptool/espsecure.py")
 
-set(ESPPORT $ENV{ESPPORT})
-if(NOT ESPPORT)
-  set(ESPPORT ${CONFIG_ESPTOOLPY_PORT})
-endif()
-
-set(ESPBAUD $ENV{ESPPORT})
-if(NOT ESPBAUD)
-  set(ESPPORT ${CONFIG_ESPTOOLPY_PORT})
-endif()
-
 set(ESPFLASHMODE ${CONFIG_ESPTOOLPY_FLASHMODE})
 set(ESPFLASHFREQ ${CONFIG_ESPTOOLPY_FLASHFREQ})
 set(ESPFLASHSIZE ${CONFIG_ESPTOOLPY_FLASHSIZE})
 
 set(ESPTOOLPY_SERIAL "${ESPTOOLPY}" --port "${ESPPORT}" --baud ${ESPBAUD})
 
-if(CONFIG_ESPTOOLPY_FLASHSIZE_DETECT)
-  set(flashsize_arg detect)
-else()
-  set(flashsize_arg ${ESPFLASHSIZE})
-endif()
-
 set(ESPTOOLPY_ELF2IMAGE_FLASH_OPTIONS --flash_mode ${ESPFLASHMODE} --flash_freq ${ESPFLASHFREQ} --flash_size ${ESPFLASHSIZE})
 
-set(ESPTOOLPY_WRITE_FLASH_OPTIONS --flash_mode ${ESPFLASHMODE} --flash_freq ${ESPFLASHFREQ} --flash_size ${flashsize_Arg})
+if(CONFIG_ESPTOOLPY_FLASHSIZE_DETECT)
+  # Set ESPFLASHSIZE to 'detect' *after* elf2image options are generated,
+  # as elf2image can't have 'detect' as an option...
+  set(ESPFLASHSIZE detect)
+endif()
 
-set(ESPTOOLPY_WRITE_FLASH ${ESPTOOLPY_SERIAL} write_flash ${ESPTOOLPY_WRITE_FLASH_OPTIONS})
+# Set variables if the PHY data partition is in the flash
+if (CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION)
+  set(PHY_PARTITION_OFFSET   ${CONFIG_PHY_DATA_OFFSET})
+  set(PHY_PARTITION_BIN_FILE "esp32/phy_init_data.bin")
+endif()
 
 #
-# Add 'binary' target - generates with elf2image
+# Add 'app.bin' target - generates with elf2image
 #
 add_custom_command(OUTPUT "${PROJECT_NAME}.bin"
   COMMAND ${ESPTOOLPY} elf2image ${ESPTOOLPY_ELF2IMAGE_FLASH_OPTIONS} -o "${PROJECT_NAME}.bin" "${PROJECT_NAME}.elf"
   DEPENDS ${PROJECT_NAME}.elf
   VERBATIM
   )
-add_custom_target(binary ALL DEPENDS "${PROJECT_NAME}.bin")
+add_custom_target(app ALL DEPENDS "${PROJECT_NAME}.bin")
 
 #
 # Add 'flash' target - not all build systems can run this directly
 #
-add_custom_target(flash DEPENDS binary partition_table bootloader_subproject)
-# TODO: this target should call "idftool" not esptool directly, so it can
-# override things (port, baud, etc) at runtime not configure time
+function(esptool_py_custom_target target_name flasher_filename dependencies)
+  add_custom_target(${target_name} DEPENDS ${dependencies}
+    COMMAND ${ESPTOOLPY} -p ${CONFIG_ESPTOOLPY_PORT} -b ${CONFIG_ESPTOOLPY_BAUD} write_flash @flash_${flasher_filename}_args
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    )
+endfunction()
+
+esptool_py_custom_target(flash project "app;partition_table;bootloader")
+esptool_py_custom_target(app-flash app "app")
+esptool_py_custom_target(bootloader-flash bootloader "bootloader")