Skip to content

ESP32-XX: fix hardware flash encryption issue when updating images #2320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 1, 2025
Merged

ESP32-XX: fix hardware flash encryption issue when updating images #2320

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6cbbd90
espressif: bump supported IDF code to v5.1.6
almir-okato May 24, 2025
7b2a04d
espressif: reorganize iram_loader.text section to reduce its size
almir-okato Aug 21, 2025
1985040
espressif: ci: add C2, C6 and H2 builds and adjust for hal v5.1.6
almir-okato Aug 21, 2025
acd0144
espressif: add forced aligned flash erase
almir-okato May 24, 2025
fe7f595
espressif: fix flash write/erase operation when encryption is enabled
almir-okato Jul 29, 2025
e1f0215
espressif: flash: fix image wrong state after swap-scratch when flash…
almir-okato May 24, 2025
0686764
espressif: flash: refactor force aligned write and erase algorithms
almir-okato Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
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 <almir.okato@espressif.com>
  • Loading branch information
@almir-okato
almir-okato committed Sep 11, 2025
commit 6cbbd90223774465f75cfe786abe309880a7a335
3 changes: 2 additions & 1 deletion boot/espressif/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions boot/espressif/hal/include/esp32c2/esp32c2.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
1 change: 1 addition & 0 deletions boot/espressif/hal/include/esp32c3/esp32c3.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
2 changes: 2 additions & 0 deletions boot/espressif/hal/include/esp32c6/esp32c6.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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(
Expand Down
2 changes: 2 additions & 0 deletions boot/espressif/hal/include/esp32h2/esp32h2.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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(
Expand Down
1 change: 1 addition & 0 deletions boot/espressif/hal/include/esp32s3/esp32s3.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Empty file added boot/espressif/hal/include/stubs.h
View file
Open in desktop
Empty file.
Empty file added boot/espressif/hal/include/zephyr_compat.h
View file
Open in desktop
Empty file.
2 changes: 2 additions & 0 deletions boot/espressif/port/esp32h2/bootloader.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down