espressif: bump supported IDF code to v5.1.6

Also fix build if hal_espressif is used as IDF code layer (hal)
for Espressif Port

Signed-off-by: Almir Okato <[email protected]>

Author: almir-okato

boot/espressif/CMakeLists.txt

@@ -13,8 +13,9 @@ endif()
 
 add_definitions(-DMCUBOOT_TARGET=${MCUBOOT_TARGET})
 add_definitions(-D__ESPRESSIF__=1)
+add_definitions(-DCONFIG_MCUBOOT_ESPRESSIF=1)
 
-set(EXPECTED_IDF_HAL_VERSION "5.1.4")
+set(EXPECTED_IDF_HAL_VERSION "5.1.6")
 
 if ("${MCUBOOT_TARGET}" STREQUAL "esp32" OR
     "${MCUBOOT_TARGET}" STREQUAL "esp32s2" OR

boot/espressif/hal/include/esp32c2/esp32c2.cmake

@@ -17,6 +17,7 @@ endif()
 
 list(APPEND LINKER_SCRIPTS
     -T${esp_hal_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.newlib.ld
+    -T${esp_hal_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.version.ld
 )
 
 set_source_files_properties(

boot/espressif/hal/include/esp32c3/esp32c3.cmake

@@ -17,4 +17,5 @@ endif()
 list(APPEND LINKER_SCRIPTS
     -T${esp_hal_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.newlib.ld
     -T${esp_hal_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.version.ld
 )

boot/espressif/hal/include/esp32c6/esp32c6.cmake

@@ -7,6 +7,7 @@ list(APPEND include_dirs
 )
 
 list(APPEND hal_srcs
+    ${esp_hal_dir}/components/bootloader_support/src/${MCUBOOT_TARGET}/bootloader_ecdsa.c
     ${esp_hal_dir}/components/hal/cache_hal.c
     ${esp_hal_dir}/components/hal/lp_timer_hal.c
     ${esp_hal_dir}/components/efuse/src/efuse_controller/keys/with_key_purposes/esp_efuse_api_key.c
@@ -22,6 +23,7 @@ endif()
 
 list(APPEND LINKER_SCRIPTS
     -T${esp_hal_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.newlib.ld
+    -T${esp_hal_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.version.ld
 )
 
 set_source_files_properties(

boot/espressif/hal/include/esp32h2/esp32h2.cmake

@@ -9,6 +9,7 @@ list(APPEND include_dirs
 list(APPEND hal_srcs
     ${esp_hal_dir}/components/hal/cache_hal.c
     ${esp_hal_dir}/components/hal/lp_timer_hal.c
+    ${esp_hal_dir}/components/efuse/${MCUBOOT_TARGET}/esp_efuse_table_v0.0_v1.1.c
     ${esp_hal_dir}/components/efuse/src/efuse_controller/keys/with_key_purposes/esp_efuse_api_key.c
     ${esp_hal_dir}/components/esp_rom/patches/esp_rom_regi2c_${MCUBOOT_TARGET}.c
     ${esp_hal_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}/pmu_param.c
@@ -22,6 +23,7 @@ endif()
 
 list(APPEND LINKER_SCRIPTS
     -T${esp_hal_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.newlib.ld
+    -T${esp_hal_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.version.ld
 )
 
 set_source_files_properties(

boot/espressif/hal/include/esp32s3/esp32s3.cmake

@@ -17,6 +17,7 @@ endif()
 
 list(APPEND LINKER_SCRIPTS
     -T${esp_hal_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.newlib.ld
+    -T${esp_hal_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.version.ld
     )
 
 set_source_files_properties(

boot/espressif/hal/include/stubs.h

@@ -87,6 +87,8 @@ CONFIG_ESP_CONSOLE_UART_NUM=0
 # CONFIG_SECURE_BOOT_ALLOW_JTAG=1
 # CONFIG_SECURE_BOOT_ALLOW_ROM_BASIC=1
 
+# CONFIG_SECURE_FLASH_PSEUDO_ROUND_FUNC_STRENGTH=1
+
 # Options for enabling eFuse emulation in Flash (adjust
 # CONFIG_EFUSE_VIRTUAL_OFFSET accordingly in order
 # to not overlap with other flash regions)