Merge branch 'feat/bootloader_nvs_read_encrypted_v5.2' into 'release/v5.2'

fix(esptool_py): NVS partition being incorrectly marked as encrypted by the build system (v5.2)

See merge request espressif/esp-idf!36681
This commit is contained in:
Mahavir Jain 2025-02-28 15:51:39 +08:00
commit 015e4f1b49

View File

@ -251,13 +251,13 @@ function(esptool_py_partition_needs_encryption retencrypted partition_name)
# - DATA 0x01 # - DATA 0x01
# Subtypes: # Subtypes:
# - ota 0x00 # - ota 0x00
# - nvs 0x02 # - nvs_keys 0x04
# If the partition is an app, an OTA or an NVS partition, then it should # If the partition is an app, an OTA or an NVS keys partition, then it should
# be encrypted # be encrypted
if( if(
(${type} EQUAL 0) OR (${type} EQUAL 0) OR
(${type} EQUAL 1 AND ${subtype} EQUAL 0) OR (${type} EQUAL 1 AND ${subtype} EQUAL 0) OR
(${type} EQUAL 1 AND ${subtype} EQUAL 2) (${type} EQUAL 1 AND ${subtype} EQUAL 4)
) )
set(encrypted TRUE) set(encrypted TRUE)
endif() endif()