From c760b3c0ab27300d7a6c43060afcaecd1708b45b Mon Sep 17 00:00:00 2001
From: Switi Mhaiske <switi.mhaiske@espressif.com>
Date: Mon, 28 Jun 2021 18:03:25 +0530
Subject: [PATCH] ESP32: Add support for flashing using .flash.py

---
 .../all-clusters-app/esp32/CMakeLists.txt     | 35 +++++++++++++++
 examples/all-clusters-app/esp32/README.md     | 11 +++++
 .../persistent-storage/esp32/CMakeLists.txt   | 35 +++++++++++++++
 examples/pigweed-app/esp32/CMakeLists.txt     | 45 +++++++++++++++++++
 .../esp32/CMakeLists.txt                      | 35 +++++++++++++++
 scripts/flashing/esp32_firmware_utils.py      |  3 +-
 6 files changed, 163 insertions(+), 1 deletion(-)

diff --git a/examples/all-clusters-app/esp32/CMakeLists.txt b/examples/all-clusters-app/esp32/CMakeLists.txt
index b60acab5e039a3..930da3d1be2d3e 100644
--- a/examples/all-clusters-app/esp32/CMakeLists.txt
+++ b/examples/all-clusters-app/esp32/CMakeLists.txt
@@ -35,3 +35,38 @@ endif()
 project(chip-all-clusters-app)
 idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++14;-Os;-DLWIP_IPV6_SCOPES=0;-DCHIP_HAVE_CONFIG_H" APPEND)
 idf_build_set_property(C_COMPILE_OPTIONS "-Os;-DLWIP_IPV6_SCOPES=0" APPEND)
+
+idf_build_get_property(build_dir BUILD_DIR)
+idf_build_get_property(project_path PROJECT_DIR)
+idf_build_get_property(sdkconfig SDKCONFIG)
+idf_build_get_property(idf_path IDF_PATH)
+
+add_custom_command(OUTPUT "${build_dir}/firmware_utils.py"
+    COMMAND ${CMAKE_COMMAND} ARGS -E copy "${project_path}/third_party/connectedhomeip/scripts/flashing/firmware_utils.py" "${build_dir}/"
+    WORKING_DIRECTORY ${build_dir}
+    VERBATIM)
+
+add_custom_command(OUTPUT "${build_dir}/esp32_firmware_utils.py"
+    COMMAND ${CMAKE_COMMAND} ARGS -E copy "${project_path}/third_party/connectedhomeip/scripts/flashing/esp32_firmware_utils.py" "${build_dir}/"
+    WORKING_DIRECTORY ${build_dir}
+    VERBATIM)
+
+add_custom_command(OUTPUT "${build_dir}/${CMAKE_PROJECT_NAME}.flash.py"
+    COMMAND ${python}
+            "${project_path}/../../../scripts/flashing/gen_flashing_script.py" esp32
+            --output "${build_dir}/${CMAKE_PROJECT_NAME}.flash.py"
+            --port "$ENV{ESPPORT}"
+            --baud "$ENV{ESPBAUD}"
+            --before ${CONFIG_ESPTOOLPY_BEFORE}
+            --after ${CONFIG_ESPTOOLPY_AFTER}
+            --application "${CMAKE_PROJECT_NAME}.bin"
+            --bootloader "bootloader/bootloader.bin"
+            --partition "partition_table/partition-table.bin"
+            --use-partition-file "${build_dir}/partition_table/partition-table.bin"
+            --use-parttool ${idf_path}/components/partition_table/parttool.py
+            --use-sdkconfig ${project_path}/sdkconfig
+    WORKING_DIRECTORY ${build_dir}
+    COMMENT "To flash ${build_dir}/${CMAKE_PROJECT_NAME}.bin run ./build/${CMAKE_PROJECT_NAME}.flash.py"
+    VERBATIM)
+
+add_custom_target(flashing_script DEPENDS "${build_dir}/${CMAKE_PROJECT_NAME}.bin" "${build_dir}/${CMAKE_PROJECT_NAME}.flash.py" "${build_dir}/esp32_firmware_utils.py" "${build_dir}/firmware_utils.py")
diff --git a/examples/all-clusters-app/esp32/README.md b/examples/all-clusters-app/esp32/README.md
index 2aabfba557558d..348fffd29535c4 100644
--- a/examples/all-clusters-app/esp32/README.md
+++ b/examples/all-clusters-app/esp32/README.md
@@ -12,6 +12,7 @@ control.
         -   [Setting up Python Controller](#setting-up-python-controller)
         -   [Commissioning over BLE](#commissioning-over-ble)
         -   [Cluster control](#cluster-control)
+    -   [Flashing app using script](#flashing-app-using-script)
     -   [Note](#note)
 
 ---
@@ -214,6 +215,16 @@ commissioning and cluster control.
 
     `chip-device-ctrl > zcl OnOff Off 135246 1 0`
 
+### Flashing app using script
+
+-   Follow these steps to use ${app_name}.flash.py script
+        
+        $ export ESPPORT=${/dev/tty.SLAB_USBtoUART}
+        $ export ESPBAUD=${baud_value}
+        $ idf.py build
+        $ idf.py flashing_script
+        $ python ${app_name}.flash.py
+   
 ### Note
 
 This demo app illustrates controlling OnOff cluster (Server) attributes of an
diff --git a/examples/persistent-storage/esp32/CMakeLists.txt b/examples/persistent-storage/esp32/CMakeLists.txt
index 0e0a452beab877..7754aaf940a65e 100644
--- a/examples/persistent-storage/esp32/CMakeLists.txt
+++ b/examples/persistent-storage/esp32/CMakeLists.txt
@@ -25,3 +25,38 @@ set(EXTRA_COMPONENT_DIRS
 project(persistent-storage)
 idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++14;-Os;-DLWIP_IPV6_SCOPES=0;-DCHIP_HAVE_CONFIG_H" APPEND)
 idf_build_set_property(C_COMPILE_OPTIONS "-Os;-DLWIP_IPV6_SCOPES=0" APPEND)
+
+idf_build_get_property(build_dir BUILD_DIR)
+idf_build_get_property(project_path PROJECT_DIR)
+idf_build_get_property(sdkconfig SDKCONFIG)
+idf_build_get_property(idf_path IDF_PATH)
+
+add_custom_command(OUTPUT "${build_dir}/firmware_utils.py"
+    COMMAND ${CMAKE_COMMAND} ARGS -E copy "${project_path}/third_party/connectedhomeip/scripts/flashing/firmware_utils.py" "${build_dir}/"
+    WORKING_DIRECTORY ${build_dir}
+    VERBATIM)
+
+add_custom_command(OUTPUT "${build_dir}/esp32_firmware_utils.py"
+    COMMAND ${CMAKE_COMMAND} ARGS -E copy "${project_path}/third_party/connectedhomeip/scripts/flashing/esp32_firmware_utils.py" "${build_dir}/"
+    WORKING_DIRECTORY ${build_dir}
+    VERBATIM)
+
+add_custom_command(OUTPUT "${build_dir}/${CMAKE_PROJECT_NAME}.flash.py"
+    COMMAND ${python}
+            "${project_path}/../../../scripts/flashing/gen_flashing_script.py" esp32
+            --output "${build_dir}/${CMAKE_PROJECT_NAME}.flash.py"
+            --port "$ENV{ESPPORT}"
+            --baud "$ENV{ESPBAUD}"
+            --before ${CONFIG_ESPTOOLPY_BEFORE}
+            --after ${CONFIG_ESPTOOLPY_AFTER}
+            --application "${CMAKE_PROJECT_NAME}.bin"
+            --bootloader "bootloader/bootloader.bin"
+            --partition "partition_table/partition-table.bin"
+            --use-partition-file "${build_dir}/partition_table/partition-table.bin"
+            --use-parttool ${idf_path}/components/partition_table/parttool.py
+            --use-sdkconfig ${project_path}/sdkconfig
+    WORKING_DIRECTORY ${build_dir}
+    COMMENT "To flash ${build_dir}/${CMAKE_PROJECT_NAME}.bin run ./build/${CMAKE_PROJECT_NAME}.flash.py"
+    VERBATIM)
+
+add_custom_target(flashing_script DEPENDS "${build_dir}/${CMAKE_PROJECT_NAME}.bin" "${build_dir}/${CMAKE_PROJECT_NAME}.flash.py" "${build_dir}/esp32_firmware_utils.py" "${build_dir}/firmware_utils.py")
diff --git a/examples/pigweed-app/esp32/CMakeLists.txt b/examples/pigweed-app/esp32/CMakeLists.txt
index 1ef286f64220d0..cd200eb302fc61 100644
--- a/examples/pigweed-app/esp32/CMakeLists.txt
+++ b/examples/pigweed-app/esp32/CMakeLists.txt
@@ -26,3 +26,48 @@ set(EXTRA_COMPONENT_DIRS
 project(chip-pigweed-app)
 idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++17;-Os;-DLWIP_IPV6_SCOPES=0;-DCHIP_HAVE_CONFIG_H" APPEND)
 idf_build_set_property(C_COMPILE_OPTIONS "-Os;-DLWIP_IPV6_SCOPES=0" APPEND)
+
+idf_build_get_property(build_dir BUILD_DIR)
+idf_build_get_property(project_path PROJECT_DIR)
+idf_build_get_property(sdkconfig SDKCONFIG)
+idf_build_get_property(idf_path IDF_PATH)
+
+add_custom_command(OUTPUT "${build_dir}/firmware_utils.py"
+    COMMAND ${CMAKE_COMMAND} ARGS -E copy "${project_path}/third_party/connectedhomeip/scripts/flashing/firmware_utils.py" "${build_dir}/"
+    WORKING_DIRECTORY ${build_dir}
+    VERBATIM)
+
+add_custom_command(OUTPUT "${build_dir}/esp32_firmware_utils.py"
+    COMMAND ${CMAKE_COMMAND} ARGS -E copy "${project_path}/third_party/connectedhomeip/scripts/flashing/esp32_firmware_utils.py" "${build_dir}/"
+    WORKING_DIRECTORY ${build_dir}
+    VERBATIM)
+
+add_custom_command(OUTPUT "${build_dir}/echo_test.py"
+    COMMAND ${CMAKE_COMMAND} ARGS -E copy "${project_path}/../mobly_tests/echo_test.py" "${build_dir}/"
+    WORKING_DIRECTORY ${build_dir}
+    VERBATIM)
+
+add_custom_command(OUTPUT "${build_dir}/echo_test_config.yml"
+    COMMAND ${CMAKE_COMMAND} ARGS -E copy "${project_path}/echo_test_config.yml" "${build_dir}/"
+    WORKING_DIRECTORY ${build_dir}
+    VERBATIM)
+
+add_custom_command(OUTPUT "${build_dir}/${CMAKE_PROJECT_NAME}.flash.py"
+    COMMAND ${python}
+            "${project_path}/../../../scripts/flashing/gen_flashing_script.py" esp32
+            --output "${build_dir}/${CMAKE_PROJECT_NAME}.flash.py"
+            --port "$ENV{ESPPORT}"
+            --baud "$ENV{ESPBAUD}"
+            --before ${CONFIG_ESPTOOLPY_BEFORE}
+            --after ${CONFIG_ESPTOOLPY_AFTER}
+            --application "${CMAKE_PROJECT_NAME}.bin"
+            --bootloader "bootloader/bootloader.bin"
+            --partition "partition_table/partition-table.bin"
+            --use-partition-file "${build_dir}/partition_table/partition-table.bin"
+            --use-parttool ${idf_path}/components/partition_table/parttool.py
+            --use-sdkconfig ${project_path}/sdkconfig
+    WORKING_DIRECTORY ${build_dir}
+    COMMENT "To flash ${build_dir}/${CMAKE_PROJECT_NAME}.bin run ./build/${CMAKE_PROJECT_NAME}.flash.py"
+    VERBATIM)
+
+add_custom_target(flashing_script DEPENDS "${build_dir}/${CMAKE_PROJECT_NAME}.bin" "${build_dir}/${CMAKE_PROJECT_NAME}.flash.py" "${build_dir}/esp32_firmware_utils.py" "${build_dir}/firmware_utils.py" "${build_dir}/echo_test.py" "${build_dir}/echo_test_config.yml")
diff --git a/examples/temperature-measurement-app/esp32/CMakeLists.txt b/examples/temperature-measurement-app/esp32/CMakeLists.txt
index 1638b6d067a270..6cb2d39d49c687 100644
--- a/examples/temperature-measurement-app/esp32/CMakeLists.txt
+++ b/examples/temperature-measurement-app/esp32/CMakeLists.txt
@@ -36,3 +36,38 @@ set(EXTRA_COMPONENT_DIRS
 project(chip-temperature-measurement-app)
 idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++14;-Os;-DLWIP_IPV6_SCOPES=0;-DCHIP_HAVE_CONFIG_H" APPEND)
 idf_build_set_property(C_COMPILE_OPTIONS "-Os;-DLWIP_IPV6_SCOPES=0" APPEND)
+
+idf_build_get_property(build_dir BUILD_DIR)
+idf_build_get_property(project_path PROJECT_DIR)
+idf_build_get_property(sdkconfig SDKCONFIG)
+idf_build_get_property(idf_path IDF_PATH)
+
+add_custom_command(OUTPUT "${build_dir}/firmware_utils.py"
+    COMMAND ${CMAKE_COMMAND} ARGS -E copy "${project_path}/third_party/connectedhomeip/scripts/flashing/firmware_utils.py" "${build_dir}/"
+    WORKING_DIRECTORY ${build_dir}
+    VERBATIM)
+
+add_custom_command(OUTPUT "${build_dir}/esp32_firmware_utils.py"
+    COMMAND ${CMAKE_COMMAND} ARGS -E copy "${project_path}/third_party/connectedhomeip/scripts/flashing/esp32_firmware_utils.py" "${build_dir}/"
+    WORKING_DIRECTORY ${build_dir}
+    VERBATIM)
+
+add_custom_command(OUTPUT "${build_dir}/${CMAKE_PROJECT_NAME}.flash.py"
+    COMMAND ${python}
+            "${project_path}/../../../scripts/flashing/gen_flashing_script.py" esp32
+            --output "${build_dir}/${CMAKE_PROJECT_NAME}.flash.py"
+            --port "$ENV{ESPPORT}"
+            --baud "$ENV{ESPBAUD}"
+            --before ${CONFIG_ESPTOOLPY_BEFORE}
+            --after ${CONFIG_ESPTOOLPY_AFTER}
+            --application "${CMAKE_PROJECT_NAME}.bin"
+            --bootloader "bootloader/bootloader.bin"
+            --partition "partition_table/partition-table.bin"
+            --use-partition-file "${build_dir}/partition_table/partition-table.bin"
+            --use-parttool ${idf_path}/components/partition_table/parttool.py
+            --use-sdkconfig ${project_path}/sdkconfig
+    WORKING_DIRECTORY ${build_dir}
+    COMMENT "To flash ${build_dir}/${CMAKE_PROJECT_NAME}.bin run ./build/${CMAKE_PROJECT_NAME}.flash.py"
+    VERBATIM)
+
+add_custom_target(flashing_script DEPENDS "${build_dir}/${CMAKE_PROJECT_NAME}.bin" "${build_dir}/${CMAKE_PROJECT_NAME}.flash.py" "${build_dir}/esp32_firmware_utils.py" "${build_dir}/firmware_utils.py")
diff --git a/scripts/flashing/esp32_firmware_utils.py b/scripts/flashing/esp32_firmware_utils.py
index 6b53f1e863af66..50c904464cc067 100755
--- a/scripts/flashing/esp32_firmware_utils.py
+++ b/scripts/flashing/esp32_firmware_utils.py
@@ -227,10 +227,11 @@
         },
         'bootloader_offset': {
             'help': 'Bootloader offset',
-            'default': '0x1000',
+            'default': None,
             'argparse': {
                 'metavar': 'OFFSET'
             },
+            'sdkconfig': 'CONFIG_BOOTLOADER_OFFSET_IN_FLASH',
         },
         'partition': {
             'help': 'Partition table image',