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

Merge branch 'bugfix/spiram_reserve_size_pr5373_v4.2' into 'release/v4.2'

Browse Source 
SPIRAM reserved memory size fixes (v4.2)

See merge request espressif/esp-idf!11516
This commit is contained in:
Angus Gratton
2020-12-24 13:55:35 +08:00
parent ac5b7be7c2 d1a9f9ec74
commit 774fb48f9e
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/soc/src/esp32/soc_memory_layout.c
View File

@ -74,12 +74,7 @@ const soc_memory_type_desc_t soc_memory_types[] = {
const size_t soc_memory_type_count = sizeof(soc_memory_types)/sizeof(soc_memory_type_desc_t); const size_t soc_memory_type_count = sizeof(soc_memory_types)/sizeof(soc_memory_type_desc_t);
#if CONFIG_SPIRAM_SIZE == -1
// Assume we need to reserve 4MB in the auto-detection case
#define RESERVE_SPIRAM_SIZE (4*1024*1024) #define RESERVE_SPIRAM_SIZE (4*1024*1024)
#else
#define RESERVE_SPIRAM_SIZE CONFIG_SPIRAM_SIZE
#endif
/* /*
Region descriptors. These describe all regions of memory available, and map them to a type in the above type. Region descriptors. These describe all regions of memory available, and map them to a type in the above type.