Merge branch 'feature/extmem_alloc_for_s2_v4.3' into 'release/v4.3'

External memory allocation policy support  for ESP32-S2 (GitHub PR) (v4.3)

See merge request espressif/esp-idf!13619
This commit is contained in:
Mahavir Jain 2021-06-16 16:34:13 +00:00
commit a213b289be
3 changed files with 18 additions and 13 deletions

View File

@ -33,20 +33,25 @@ if BLE_MESH
behavior in ESP-IDF behavior in ESP-IDF
- Internal IRAM memory wherever applicable else internal DRAM - Internal IRAM memory wherever applicable else internal DRAM
Recommended mode here is always internal, since that is most preferred Recommended mode here is always internal (*), since that is most preferred
from security perspective. But if application requirement does not allow from security perspective. But if application requirement does not
sufficient free internal memory then alternate mode can be selected. allow sufficient free internal memory then alternate mode can be
selected.
(*) In case of ESP32-S2/ESP32-S3, hardware allows encryption of external
SPIRAM contents provided hardware flash encryption feature is enabled.
In that case, using external SPIRAM allocation strategy is also safe choice
from security perspective.
config BLE_MESH_MEM_ALLOC_MODE_INTERNAL config BLE_MESH_MEM_ALLOC_MODE_INTERNAL
bool "Internal DRAM" bool "Internal DRAM"
config BLE_MESH_MEM_ALLOC_MODE_EXTERNAL config BLE_MESH_MEM_ALLOC_MODE_EXTERNAL
bool "External SPIRAM" bool "External SPIRAM"
depends on ESP32_SPIRAM_SUPPORT depends on SPIRAM_USE_CAPS_ALLOC || SPIRAM_USE_MALLOC
config BLE_MESH_MEM_ALLOC_MODE_DEFAULT config BLE_MESH_MEM_ALLOC_MODE_DEFAULT
bool "Default alloc mode" bool "Default alloc mode"
depends on ESP32_SPIRAM_SUPPORT
help help
Enable this option to use the default memory allocation strategy when Enable this option to use the default memory allocation strategy when
external SPIRAM is enabled. See the SPIRAM options for more details. external SPIRAM is enabled. See the SPIRAM options for more details.

View File

@ -12,17 +12,12 @@ choice BT_NIMBLE_MEM_ALLOC_MODE
behavior in ESP-IDF behavior in ESP-IDF
- Internal IRAM memory wherever applicable else internal DRAM - Internal IRAM memory wherever applicable else internal DRAM
Recommended mode here is always internal, since that is most preferred
from security perspective. But if application requirement does not
allow sufficient free internal memory then alternate mode can be
selected.
config BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL config BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL
bool "Internal memory" bool "Internal memory"
config BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL config BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL
bool "External SPIRAM" bool "External SPIRAM"
depends on ESP32_SPIRAM_SUPPORT depends on SPIRAM_USE_CAPS_ALLOC || SPIRAM_USE_MALLOC
config BT_NIMBLE_MEM_ALLOC_MODE_DEFAULT config BT_NIMBLE_MEM_ALLOC_MODE_DEFAULT
bool "Default alloc mode" bool "Default alloc mode"

View File

@ -15,17 +15,22 @@ menu "mbedTLS"
mbedtls_platform_set_calloc_free() function mbedtls_platform_set_calloc_free() function
- Internal IRAM memory wherever applicable else internal DRAM - Internal IRAM memory wherever applicable else internal DRAM
Recommended mode here is always internal, since that is most preferred Recommended mode here is always internal (*), since that is most preferred
from security perspective. But if application requirement does not from security perspective. But if application requirement does not
allow sufficient free internal memory then alternate mode can be allow sufficient free internal memory then alternate mode can be
selected. selected.
(*) In case of ESP32-S2/ESP32-S3, hardware allows encryption of external
SPIRAM contents provided hardware flash encryption feature is enabled.
In that case, using external SPIRAM allocation strategy is also safe choice
from security perspective.
config MBEDTLS_INTERNAL_MEM_ALLOC config MBEDTLS_INTERNAL_MEM_ALLOC
bool "Internal memory" bool "Internal memory"
config MBEDTLS_EXTERNAL_MEM_ALLOC config MBEDTLS_EXTERNAL_MEM_ALLOC
bool "External SPIRAM" bool "External SPIRAM"
depends on ESP32_SPIRAM_SUPPORT depends on SPIRAM_USE_CAPS_ALLOC || SPIRAM_USE_MALLOC
config MBEDTLS_DEFAULT_MEM_ALLOC config MBEDTLS_DEFAULT_MEM_ALLOC
bool "Default alloc mode" bool "Default alloc mode"