alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'fix/spi_test_memory_layout' into 'master'

Browse Source 
test: fix the unit test fail issue under single_core config

See merge request idf/esp-idf!3596
This commit is contained in:
Ivan Grokhotkov 2018-10-31 21:37:56 +08:00
commit a4357aed91
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/soc/esp32/include/soc/soc.h
View File

@ -286,6 +286,10 @@
#define SOC_DROM_HIGH 0x3F800000 #define SOC_DROM_HIGH 0x3F800000
#define SOC_IROM_LOW 0x400D0000 #define SOC_IROM_LOW 0x400D0000
#define SOC_IROM_HIGH 0x40400000 #define SOC_IROM_HIGH 0x40400000
#define SOC_CACHE_PRO_LOW 0x40070000
#define SOC_CACHE_PRO_HIGH 0x40078000
#define SOC_CACHE_APP_LOW 0x40078000
#define SOC_CACHE_APP_HIGH 0x40080000
#define SOC_IRAM_LOW 0x40080000 #define SOC_IRAM_LOW 0x40080000
#define SOC_IRAM_HIGH 0x400A0000 #define SOC_IRAM_HIGH 0x400A0000
#define SOC_RTC_IRAM_LOW 0x400C0000 #define SOC_RTC_IRAM_LOW 0x400C0000

4
components/soc/esp32/soc_memory_layout.c
View File

@ -130,9 +130,9 @@ const size_t soc_memory_region_count = sizeof(soc_memory_regions)/sizeof(soc_mem
These are removed from the soc_memory_regions array when heaps are created. These are removed from the soc_memory_regions array when heaps are created.
*/ */
SOC_RESERVE_MEMORY_REGION(0x40070000, 0x40078000, cpu0_cache); SOC_RESERVE_MEMORY_REGION(SOC_CACHE_PRO_LOW, SOC_CACHE_PRO_HIGH, cpu0_cache);
#ifndef CONFIG_FREERTOS_UNICORE #ifndef CONFIG_FREERTOS_UNICORE
SOC_RESERVE_MEMORY_REGION(0x40078000, 0x40080000, cpu1_cache); SOC_RESERVE_MEMORY_REGION(SOC_CACHE_APP_LOW, SOC_CACHE_APP_HIGH, cpu1_cache);
#endif #endif
/* Warning: The ROM stack is located in the 0x3ffe0000 area. We do not specifically disable that area here because /* Warning: The ROM stack is located in the 0x3ffe0000 area. We do not specifically disable that area here because

4
components/soc/include/soc/soc_memory_layout.h
View File

@ -175,7 +175,11 @@ inline static bool IRAM_ATTR esp_ptr_external_ram(const void *p) {
} }
inline static bool IRAM_ATTR esp_ptr_in_iram(const void *p) { inline static bool IRAM_ATTR esp_ptr_in_iram(const void *p) {
#ifndef CONFIG_FREERTOS_UNICORE
return ((intptr_t)p >= SOC_IRAM_LOW && (intptr_t)p < SOC_IRAM_HIGH); return ((intptr_t)p >= SOC_IRAM_LOW && (intptr_t)p < SOC_IRAM_HIGH);
#else
return ((intptr_t)p >= SOC_CACHE_APP_LOW && (intptr_t)p < SOC_IRAM_HIGH);
#endif
} }
inline static bool IRAM_ATTR esp_ptr_in_drom(const void *p) { inline static bool IRAM_ATTR esp_ptr_in_drom(const void *p) {