commit 54ef484afac4cd018afcf26848de5de6ab6ca18f
author Almir Okato <almir.okato@espressif.com> Tue Mar 07 17:56:53 2023 -0300
committer almir-okato <66885489+almir-okato@users.noreply.github.com> Mon Jul 24 10:03:18 2023 -0300
tree 6c2d3814af07a46bd2edce049019b57d712a578c
parent 26ed3f448f98d6cf3867fee29235961ecdb997e0

espressif: remove IDF git submodule and add its reference by param

Remove the ESP-IDF from git submodules to avoid potential
duplicated repo clones on the user system. IDF HAL code is still
a dependency for Espressif port, therefore now the HAL code
reference needs to be passed by parameter when building.

The Espressif port was also updated to work with last v5.1 IDF
code.

Signed-off-by: Almir Okato <almir.okato@espressif.com>

boot/espressif/CMakeLists.txt

diff --git a/boot/espressif/CMakeLists.txt b/boot/espressif/CMakeLists.txt
index bc4cd62..184c64b 100644
--- a/boot/espressif/CMakeLists.txt
+++ b/boot/espressif/CMakeLists.txt
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 cmake_minimum_required(VERSION 3.13)
+cmake_policy(SET CMP0109 NEW)
 
 include(${CMAKE_CURRENT_LIST_DIR}/tools/utils.cmake)
 
@@ -36,13 +37,15 @@
     message(FATAL_ERROR "Unsupported target ${MCUBOOT_TARGET}")
 endif()
 
-if (NOT DEFINED IDF_PATH)
-    if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/hal/esp-idf")
-        set(IDF_PATH "${CMAKE_CURRENT_LIST_DIR}/hal/esp-idf")
-    elseif (DEFINED ENV{IDF_PATH})
-        set(IDF_PATH $ENV{IDF_PATH})
+if (NOT DEFINED ESP_HAL_PATH)
+    if (DEFINED ENV{ESP_HAL_PATH})
+        set(ESP_HAL_PATH $ENV{ESP_HAL_PATH})
     else()
-        message(FATAL_ERROR "IDF_PATH not found. Please update submodules or set IDF_PATH environment variable or pass -DIDF_PATH flag.")
+        message(WARNING "ESP_HAL_PATH not found. Please set -DESP_HAL_PATH parameter or define ESP_HAL_PATH environment variable.")
+        if (DEFINED ENV{IDF_PATH})
+            set(ESP_HAL_PATH $ENV{IDF_PATH})
+            message("IDF installation found in the system, using IDF_PATH as ESP_HAL_PATH.")
+        endif()
     endif()
 endif()
 
@@ -92,7 +95,11 @@
     NAMES esptool esptool.py
     )
 if ("${ESPTOOL_COMMAND}" MATCHES "ESPTOOL_COMMAND-NOTFOUND")
-    set(esptool_path "${IDF_PATH}/components/esptool_py/esptool/esptool.py")
+    if (DEFINED ENV{IDF_PATH})
+        set(esptool_path "${IDF_PATH}/components/esptool_py/esptool/esptool.py")
+    else()
+        message(FATAL_ERROR "esptool.py not found. Please install it using \'pip install esptool\'.")
+    endif()
 else()
     set(esptool_path "${ESPTOOL_COMMAND}")
 endif()
@@ -179,7 +186,7 @@
     "-ggdb"
     "-Os"
     "-D_GNU_SOURCE"
-    "-std=gnu99"
+    "-std=gnu17"
     "-Wno-old-style-declaration"
     "-Wno-implicit-int"
     "-Wno-declaration-after-statement"