espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2026-05-05 12:25:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ext_ram_bss_align' into 'master'

Browse Source 
Fix crash if ext_ram_bss is unaligned length

See merge request idf/esp-idf!4000
This commit is contained in:
Ivan Grokhotkov
2018-12-21 12:06:58 +08:00
parent cd29cffa20 e1a1c7f17c
commit 75ef4b2242
4 changed files with 52 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp32/ld/esp32.extram.bss.ld
+1
View File
@@ -12,6 +12,7 @@ SECTIONS
*libpp.a:(.dynsbss .sbss .sbss.* .gnu.linkonce.sb.* .scommon .sbss2.* .gnu.linkonce.sb2.* .dynbss .bss .bss.* .share.mem .gnu.linkonce.b.* COMMON)
*liblwip.a:(.dynsbss .sbss .sbss.* .gnu.linkonce.sb.* .scommon .sbss2.* .gnu.linkonce.sb2.* .dynbss .bss .bss.* .share.mem .gnu.linkonce.b.* COMMON)
*libbt.a:(EXCLUDE_FILE (libbtdm_app.a) .dynsbss .sbss .sbss.* .gnu.linkonce.sb.* .scommon .sbss2.* .gnu.linkonce.sb2.* .dynbss .bss .bss.* .share.mem .gnu.linkonce.b.* COMMON)
. = ALIGN(4);
_ext_ram_bss_end = ABSOLUTE(.);
} > extern_ram_seg
}
components/esp32/spiram.c
+1 -1
View File
@@ -61,7 +61,7 @@ static const char* TAG = "spiram";
#endif
#if CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY
extern int _ext_ram_bss_start, _ext_ram_bss_end;
extern uint8_t _ext_ram_bss_start, _ext_ram_bss_end;
#endif
static bool spiram_inited=false;