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/hal/include/esp32/esp32.cmake

diff --git a/boot/espressif/hal/include/esp32/esp32.cmake b/boot/espressif/hal/include/esp32/esp32.cmake
index 7d3776e..6e72ced 100644
--- a/boot/espressif/hal/include/esp32/esp32.cmake
+++ b/boot/espressif/hal/include/esp32/esp32.cmake
@@ -2,21 +2,31 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-list(APPEND include_dirs
-    ${esp_idf_dir}/components/${MCUBOOT_TARGET}/include
-    )
-
 list(APPEND hal_srcs
-    ${esp_idf_dir}/components/efuse/src/esp_efuse_api_key_esp32.c
+    ${esp_hal_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}/rtc_init.c
+    ${esp_hal_dir}/components/efuse/src/efuse_controller/keys/without_key_purposes/three_key_blocks/esp_efuse_api_key.c
     )
 
 if (DEFINED CONFIG_ESP_MULTI_PROCESSOR_BOOT)
     list(APPEND hal_srcs
         ${src_dir}/${MCUBOOT_TARGET}/app_cpu_start.c
+        ${esp_hal_dir}/components/esp_hw_support/cpu.c
+        )
+endif()
+
+if (DEFINED CONFIG_ESP_CONSOLE_UART_CUSTOM)
+    list(APPEND hal_srcs
+        ${src_dir}/${MCUBOOT_TARGET}/console_uart_custom.c
         )
 endif()
 
 list(APPEND LINKER_SCRIPTS
-    -T${esp_idf_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.newlib-funcs.ld
-    -T${esp_idf_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.eco3.ld
+    -T${esp_hal_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.newlib-funcs.ld
+    -T${esp_hal_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.eco3.ld
     )
+
+set_source_files_properties(
+    ${esp_hal_dir}/components/bootloader_support/src/esp32/bootloader_esp32.c
+    ${esp_hal_dir}/components/bootloader_support/bootloader_flash/src/bootloader_flash.c
+    PROPERTIES COMPILE_FLAGS
+    "-Wno-unused-variable -Wno-unused-but-set-variable")

boot/espressif/hal/include/esp32/sdkconfig.h

diff --git a/boot/espressif/hal/include/esp32/sdkconfig.h b/boot/espressif/hal/include/esp32/sdkconfig.h
index 6e76b63..7431e9b 100644
--- a/boot/espressif/hal/include/esp32/sdkconfig.h
+++ b/boot/espressif/hal/include/esp32/sdkconfig.h
@@ -8,9 +8,17 @@
 #define CONFIG_IDF_FIRMWARE_CHIP_ID 0x0000
 #define CONFIG_IDF_TARGET_ESP32 1
 #define CONFIG_ESP32_REV_MIN_3 1
+#define CONFIG_ESP32_REV_MIN_FULL 300
+#define CONFIG_ESP_REV_MIN_FULL CONFIG_ESP32_REV_MIN_FULL
 #define CONFIG_ESP32_REV_MIN 3
+#define CONFIG_ESP32_REV_MAX_FULL 399
+#define CONFIG_ESP_REV_MAX_FULL CONFIG_ESP32_REV_MAX_FULL
 #define CONFIG_SPI_FLASH_ROM_DRIVER_PATCH 1
+#define CONFIG_MMU_PAGE_SIZE 0x10000
 #define CONFIG_ESP32_XTAL_FREQ 40
+#define CONFIG_XTAL_FREQ 40
+#define CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160 1
+#define CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ 160
 #define CONFIG_MCUBOOT 1
 #define NDEBUG 1
 #define CONFIG_BOOTLOADER_WDT_TIME_MS 9000
@@ -20,3 +28,4 @@
 #define CONFIG_EFUSE_VIRTUAL_OFFSET 0x250000
 #define CONFIG_EFUSE_VIRTUAL_SIZE 0x2000
 #define CONFIG_EFUSE_MAX_BLK_LEN 192
+#define CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT 1