]> granicus.if.org Git - esp-idf/commitdiff
projects / esp-idf / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ccd0c61 304e908)
Merge branch 'bugfix/spiram_malloc_reserve_internal_fragments' into 'master'
authorAngus Gratton <angus@espressif.com>
Thu, 16 Aug 2018 03:19:39 +0000 (11:19 +0800)
committerAngus Gratton <angus@espressif.com>
Thu, 16 Aug 2018 03:19:39 +0000 (11:19 +0800)
esp32: Allow SPIRAM_MALLOC_RESERVE_INTERNAL to span multiple regions of memory

See merge request idf/esp-idf!2891

1  2 
components/esp32/cpu_start.c patch | diff1 | diff2 | blob | history
components/esp32/spiram.c patch | diff1 | diff2 | blob | history

diff --cc components/esp32/cpu_start.c
Simple merge
diff --cc components/esp32/spiram.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.