commit 72627c5029dccbe9c718f931919d38e15114fc07
author Gustavo Henrique Nihei <gustavo.nihei@espressif.com> Mon Nov 01 18:29:25 2021 -0300
committer Fabio Utzig <utzig@utzig.org> Thu Nov 04 06:15:47 2021 -0300
tree 91dc4de87bbad18074d13b03a34fbaa287c80012
parent 2fe449d116eef22a17b0dd0369b370a3d6d79142

espressif: Allow use of imgtool other than the one from repository

Signed-off-by: Gustavo Henrique Nihei <gustavo.nihei@espressif.com>

boot/espressif/CMakeLists.txt

diff --git a/boot/espressif/CMakeLists.txt b/boot/espressif/CMakeLists.txt
index 4883f53..84e38b6 100644
--- a/boot/espressif/CMakeLists.txt
+++ b/boot/espressif/CMakeLists.txt
@@ -79,6 +79,18 @@
 set(BOOTUTIL_DIR ${MCUBOOT_ROOT_DIR}/boot/bootutil)
 set(ESPRESSIF_PORT_DIR ${CMAKE_CURRENT_LIST_DIR})
 
+# Find imgtool.
+# Go with an explicitly installed imgtool first, falling
+# back to mcuboot/scripts/imgtool.py.
+find_program(IMGTOOL_COMMAND
+    NAMES imgtool imgtool.py
+    )
+if ("${IMGTOOL_COMMAND}" MATCHES "IMGTOOL_COMMAND-NOTFOUND")
+    set(imgtool_path "${MCUBOOT_ROOT_DIR}/scripts/imgtool.py")
+else()
+    set(imgtool_path "${IMGTOOL_COMMAND}")
+endif()
+
 if (DEFINED CONFIG_ESP_SIGN_RSA)
     if ("${MCUBOOT_TARGET}" STREQUAL "esp32s2" OR
         "${MCUBOOT_TARGET}" STREQUAL "esp32c3")
@@ -116,8 +128,7 @@
         add_custom_command(
             OUTPUT ${GENERATED_PUBKEY}
             COMMAND
-            ${PYTHON_EXECUTABLE}
-            ${MCUBOOT_ROOT_DIR}/scripts/imgtool.py
+            ${imgtool_path}
             getpub
             -k
             ${KEY_FILE}