espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 02:37:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/esp_app_format_missing' into 'release/v5.2'

Browse Source 
fix(esp_system): Fix build when ANTI_ROLLBACK=y and PANIC_SILENT_REBOOT=y

See merge request espressif/esp-idf!29770
This commit is contained in:
Mahavir Jain
2024-03-21 13:51:16 +08:00
parent a6895cef01 00f2e33008
commit 3c8b37087b
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_system/CMakeLists.txt
View File

@ -114,7 +114,7 @@ endif()
# need to introduce panic "event" concept to remove this dependency (IDF-2194)
idf_component_optional_requires(PRIVATE esp_gdbstub)
if(NOT CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT)
if(NOT CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT OR CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK)
idf_component_optional_requires(PRIVATE esp_app_format)
endif()

6
tools/test_apps/system/build_test/partitions.csv Normal file
View File

@ -0,0 +1,6 @@
# Name, Type, SubType, Offset, Size, Flags
nvs, data, nvs, 0xA000, 0x4000,
otadata, data, ota, 0xE000, 0x2000,
ota_0, app, ota_0, , 1M,
ota_1, app, ota_1, , 1M,
nvs_key, data, nvs_keys, , 4K,
1 # Name Type SubType Offset Size Flags
2 nvs data nvs 0xA000 0x4000
3 otadata data ota 0xE000 0x2000
4 ota_0 app ota_0 1M
5 ota_1 app ota_1 1M
6 nvs_key data nvs_keys 4K

8
tools/test_apps/system/build_test/sdkconfig.ci.panic_silent_reboot_anti_rollback Normal file
View File

@ -0,0 +1,8 @@
CONFIG_IDF_TARGET="esp32"
CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=y
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_OFFSET=0x9000
CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT=y