Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

esp32s2: move trace memory reservation to soc_memory_layout.c

Browse source
This commit is contained in:
Ivan Grokhotkov 2020-01-22 13:40:57 +01:00
parent 110f3c9ff5
commit 02a99e84c8
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/esp32s2/ld/esp32s2.ld
View file

@ -88,11 +88,7 @@ MEMORY
_static_data_end = _bss_end; _static_data_end = _bss_end;
/* Heap ends at top of dram0_0_seg _heap_end = 0x40000000;
ROM data mappings start from 0x3FFFC000,
0x3FFF4000...0x3FFFC000 can be reserved for trace memory mapping
*/
_heap_end = 0x3FFFC000 - CONFIG_ESP32S2_TRACEMEM_RESERVE_DRAM;
_data_seg_org = ORIGIN(rtc_data_seg); _data_seg_org = ORIGIN(rtc_data_seg);

6
components/soc/esp32s2/soc_memory_layout.c
View file

@ -130,5 +130,9 @@ SOC_RESERVE_MEMORY_REGION((intptr_t)&_iram_start - I_D_OFFSET, (intptr_t)&_iram_
SOC_RESERVE_MEMORY_REGION( SOC_EXTRAM_DATA_LOW, SOC_EXTRAM_DATA_HIGH, extram_data_region); //SPI RAM gets added later if needed, in spiram.c; reserve it for now SOC_RESERVE_MEMORY_REGION( SOC_EXTRAM_DATA_LOW, SOC_EXTRAM_DATA_HIGH, extram_data_region); //SPI RAM gets added later if needed, in spiram.c; reserve it for now
#endif #endif
// Blocks 19 and 20 may be reserved for the trace memory
#if CONFIG_ESP32S2_TRACEMEM_RESERVE_DRAM > 0
SOC_RESERVE_MEMORY_REGION(0x3fffc000 - CONFIG_ESP32S2_TRACEMEM_RESERVE_DRAM, 0x3fffc000, trace_mem);
#endif #endif
#endif // BOOTLOADER_BUILD