Skip to content

Commit f35290b

Browse files
committed
Cleanup part II
1 parent 70842de commit f35290b

33 files changed

+133
-75
lines changed

boards.txt

Lines changed: 68 additions & 0 deletions
Large diffs are not rendered by default.

cores/esp8266/core_esp8266_main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ extern "C" void user_init(void) {
337337
#if defined(NON32XFER_HANDLER) || defined(MMU_SEC_HEAP)
338338
install_non32xfer_exception_handler();
339339
#endif
340-
#if defined(MMU_SEC_HEAP)
340+
#if defined(MMU_IRAM_HEAP)
341341
umm_init_iram();
342342
#endif
343343
preinit(); // Prior to C++ Dynamic Init (not related to above init() ). Meant to be user redefinable.

cores/esp8266/mmu_iram.h

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -111,33 +111,36 @@ extern mmu_cre_status_t mmu_status;
111111
#ifdef DEBUG_MMU
112112

113113
static inline bool is_iram(uint32_t addr) {
114-
constexpr uint32_t _start = 0x40100000UL;
114+
// constexpr uint32_t _start = 0x40100000UL;
115115
#define IRAM_START 0x40100000UL
116116

117117
#ifndef MMU_IRAM_SIZE
118-
#define MMU_IRAM_SIZE 0x8000
118+
#define MMU_IRAM_SIZE 0xC000UL
119119
#endif
120120

121121
#ifdef MMU_SEC_HEAP_SIZE
122-
constexpr uint32_t _end = _start + MMU_IRAM_SIZE + MMU_SEC_HEAP_SIZE;
122+
// constexpr uint32_t _end = _start + MMU_IRAM_SIZE + MMU_SEC_HEAP_SIZE;
123123
#define IRAM_END (IRAM_START + MMU_IRAM_SIZE + MMU_SEC_HEAP_SIZE)
124124
#else
125-
constexpr uint32_t _end = _start + MMU_IRAM_SIZE;
125+
// constexpr uint32_t _end = _start + MMU_IRAM_SIZE;
126+
#define IRAM_END (IRAM_START + MMU_IRAM_SIZE)
126127
#endif
127128

128-
return (_start <= addr && _end > addr);
129+
return (IRAM_START <= addr && IRAM_END > addr);
129130
}
130131

131132
static inline bool is_dram(uint32_t addr) {
132-
constexpr uint32_t _start = 0x3FF80000UL;
133-
constexpr uint32_t _end = 0x40000000;
134-
return (_start <= addr && _end > addr);
133+
// constexpr uint32_t _start = 0x3FF80000UL;
134+
// constexpr uint32_t _end = 0x40000000UL;
135+
return (0x3FF80000UL <= addr && 0x40000000UL > addr);
135136
}
136137

137138
static inline bool is_icache(uint32_t addr) {
138-
constexpr uint32_t _start = 0x40200000UL;
139-
constexpr uint32_t _end = _start + 0x100000;
140-
return (_start <= addr && _end > addr);
139+
// constexpr uint32_t _start = 0x40200000UL;
140+
// constexpr uint32_t _end = _start + 0x100000UL;
141+
#define ICACHE_START 0x40200000UL
142+
#define ICACHE_END (ICACHE_START + 0x100000UL)
143+
return (ICACHE_START <= addr && ICACHE_END > addr);
141144
}
142145

143146
#else
@@ -162,14 +165,14 @@ static inline bool is_icache(uint32_t addr) {
162165
if (is_iram((uint32_t)a) || is_dram((uint32_t)a)) { \
163166
} else { \
164167
DBG_MMU_PRINTF("\nexcvaddr: %p\n", a); \
165-
assert(("Outside of Range Write", false)); \
168+
assert(("Outside of Range Write" && false)); \
166169
}
167170

168171
#define ASSERT_RANGE_TEST_READ(a) \
169172
if (is_iram((uint32_t)a) || is_icache((uint32_t)a) || is_dram((uint32_t)a)) { \
170173
} else { \
171174
DBG_MMU_PRINTF("\nexcvaddr: %p\n", a); \
172-
assert(("Outside of Range Read", false)); \
175+
assert(("Outside of Range Read" && false)); \
173176
}
174177

175178
#else

cores/esp8266/umm_malloc/umm_malloc.cpp

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -458,23 +458,12 @@ void _text_end(void);
458458
void umm_init_iram(void) __attribute__((weak));
459459

460460
void umm_init_iram(void) {
461-
uint32_t sec_heap = MMU_SEC_HEAP;
462-
size_t sec_heap_sz = MMU_SEC_HEAP_SIZE;
463-
464-
#ifdef UUM_MERGE_FREE_IRAM_W_SEC_HEAP
465-
// Combine free IRAM from 1st 32K with 16K of Second Heap
466-
uint32_t iram_free = MMU_IRAM_SIZE - (uint32_t)((uintptr_t)_text_end - 0x40100000UL);
467-
iram_free &= ~7;
468-
if (iram_free > 40) {
469-
iram_free -= 32;
470-
sec_heap -= iram_free;
471-
sec_heap_sz += iram_free;
472-
}
473-
#endif
461+
uint32_t sec_heap = (uint32_t)_text_end + 32;
462+
sec_heap &= ~7;
463+
size_t sec_heap_sz = 0xC000UL - (sec_heap - 0x40100000UL);
474464

475465
umm_init_iram_ex((void *)sec_heap, sec_heap_sz, true);
476466
}
477-
478467
#endif // #ifdef UMM_HEAP_IRAM
479468

480469
#ifdef UMM_HEAP_EXTERNAL

cores/esp8266/umm_malloc/umm_malloc_cfg.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,10 @@ extern "C" {
2323

2424
#include "c_types.h"
2525

26-
// Combine free IRAM from 1st 32K with 16K of Second Heap
27-
#define UUM_MERGE_FREE_IRAM_W_SEC_HEAP
28-
2926
/*
3027
* Define active Heaps
3128
*/
32-
#ifdef MMU_SEC_HEAP
29+
#if defined(MMU_IRAM_HEAP)
3330
#define UMM_HEAP_IRAM
3431
#else
3532
#undef UMM_HEAP_IRAM

libraries/esp8266/examples/MMU48K/MMU48K.ino

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,15 @@ static inline char get ## name(void *o) { \
1818
1919
*/
2020

21-
#if (MMU_IRAM_SIZE > 32*1024)
21+
#if defined(MMU_IRAM_HEAP)
22+
uint32_t *gobble;
23+
size_t gobble_sz;
24+
#elif (MMU_IRAM_SIZE > 32*1024)
2225
uint32_t gobble[4 * 1024] IRAM_ATTR;
2326
constexpr size_t gobble_sz = sizeof(gobble);
2427
#elif defined(MMU_SEC_HEAP)
25-
uint32_t *gobble;
26-
size_t gobble_sz;
28+
uint32_t *gobble = (uint32_t *)MMU_SEC_HEAP;
29+
size_t gobble_sz = MMU_SEC_HEAP_SIZE;
2730
#else
2831
uint32_t gobble[256] IRAM_ATTR;
2932
constexpr size_t gobble_sz = sizeof(gobble);
@@ -126,7 +129,7 @@ void setup() {
126129

127130
print_mmu_status(Serial);
128131

129-
#ifdef MMU_SEC_HEAP
132+
#if defined(MMU_IRAM_HEAP)
130133
{
131134
HeapSelectIram ephemeral;
132135
// Serial.printf_P(PSTR("ESP.getFreeHeap(): %u\n"), ESP.getFreeHeap());
@@ -138,7 +141,7 @@ void setup() {
138141

139142
#endif
140143

141-
#if (MMU_IRAM_SIZE > 0x8000) || defined(MMU_SEC_HEAP)
144+
#if (MMU_IRAM_SIZE > 0x8000) || defined(MMU_IRAM_HEAP) || defined(MMU_SEC_HEAP)
142145
if (isValid(gobble)) {
143146
// Put something in our new memory
144147
for (size_t i = 0; i < (gobble_sz / 4); i++) {
@@ -323,16 +326,12 @@ int divideA_B(int a, int b) {
323326
extern "C" void _text_end(void);
324327

325328
extern "C" void umm_init_iram(void) {
326-
// Merge free IRAM into Second Heap
327-
uint32_t iram_free = MMU_IRAM_SIZE - (uint32_t)((uintptr_t)_text_end - 0x40100000UL);
328-
uint32_t sec_heap = MMU_SEC_HEAP;
329-
size_t sec_heap_sz = MMU_SEC_HEAP_SIZE;
330-
iram_free &= ~7;
331-
if (iram_free > 40) {
332-
iram_free -= 32;
333-
sec_heap -= iram_free;
334-
sec_heap_sz += iram_free;
335-
}
329+
330+
void umm_init_iram(void) {
331+
uint32_t sec_heap = (uint32_t)_text_end + 32;
332+
sec_heap &= ~7;
333+
size_t sec_heap_sz = 0xC000UL - (sec_heap - 0x40100000UL);
334+
336335
umm_init_iram_ex((void *)sec_heap, sec_heap_sz, true);
337336
}
338337
#endif

tools/boards.txt.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -955,7 +955,7 @@
955955

956956
})
957957
])
958-
958+
959959

960960
################################################################
961961

@@ -1215,6 +1215,8 @@
12151215
( '.menu.mmu.3232.build.mmuflags', '-DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x8000'),
12161216
( '.menu.mmu.4816', '16KB cache + 48KB IRAM (IRAM)' ),
12171217
( '.menu.mmu.4816.build.mmuflags', '-DMMU_IRAM_SIZE=0xC000 -DMMU_ICACHE_SIZE=0x4000' ),
1218+
( '.menu.mmu.4816H', '16KB cache + 48KB IRAM (IRAM and Heap)' ),
1219+
( '.menu.mmu.4816H.build.mmuflags', '-DMMU_IRAM_SIZE=0xC000 -DMMU_ICACHE_SIZE=0x4000 -DMMU_IRAM_HEAP' ),
12181220
( '.menu.mmu.3216', '16KB cache + 32KB IRAM + 16KB sec heap (Heap)' ),
12191221
( '.menu.mmu.3216.build.mmuflags', '-DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x4000 -DMMU_SEC_HEAP=0x40108000 -DMMU_SEC_HEAP_SIZE=0x4000' ),
12201222
]),
@@ -1397,7 +1399,7 @@ def flash_map (flashsize_kb, fs_kb = 0):
13971399
print("{")
13981400
print(" dport0_0_seg : org = 0x3FF00000, len = 0x10")
13991401
print(" dram0_0_seg : org = 0x3FFE8000, len = 0x14000")
1400-
print(" iram1_0_seg : org = 0x40100000, len = MMU_IRAM_SIZE")
1402+
print(" iram1_0_seg : org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */")
14011403
print(" irom0_0_seg : org = 0x40201010, len = 0x%x" % max_upload_size)
14021404
print("}")
14031405
print("")

tools/sdk/ld/eagle.flash.16m14m.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MEMORY
1010
{
1111
dport0_0_seg : org = 0x3FF00000, len = 0x10
1212
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13-
iram1_0_seg : org = 0x40100000, len = MMU_IRAM_SIZE
13+
iram1_0_seg : org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
1414
irom0_0_seg : org = 0x40201010, len = 0xfeff0
1515
}
1616

tools/sdk/ld/eagle.flash.16m15m.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MEMORY
1010
{
1111
dport0_0_seg : org = 0x3FF00000, len = 0x10
1212
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13-
iram1_0_seg : org = 0x40100000, len = MMU_IRAM_SIZE
13+
iram1_0_seg : org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
1414
irom0_0_seg : org = 0x40201010, len = 0xfeff0
1515
}
1616

tools/sdk/ld/eagle.flash.1m.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MEMORY
1010
{
1111
dport0_0_seg : org = 0x3FF00000, len = 0x10
1212
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13-
iram1_0_seg : org = 0x40100000, len = MMU_IRAM_SIZE
13+
iram1_0_seg : org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
1414
irom0_0_seg : org = 0x40201010, len = 0xf9ff0
1515
}
1616

tools/sdk/ld/eagle.flash.1m128.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MEMORY
1010
{
1111
dport0_0_seg : org = 0x3FF00000, len = 0x10
1212
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13-
iram1_0_seg : org = 0x40100000, len = MMU_IRAM_SIZE
13+
iram1_0_seg : org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
1414
irom0_0_seg : org = 0x40201010, len = 0xd9ff0
1515
}
1616

tools/sdk/ld/eagle.flash.1m144.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MEMORY
1010
{
1111
dport0_0_seg : org = 0x3FF00000, len = 0x10
1212
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13-
iram1_0_seg : org = 0x40100000, len = MMU_IRAM_SIZE
13+
iram1_0_seg : org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
1414
irom0_0_seg : org = 0x40201010, len = 0xd5ff0
1515
}
1616

tools/sdk/ld/eagle.flash.1m160.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MEMORY
1010
{
1111
dport0_0_seg : org = 0x3FF00000, len = 0x10
1212
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13-
iram1_0_seg : org = 0x40100000, len = MMU_IRAM_SIZE
13+
iram1_0_seg : org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
1414
irom0_0_seg : org = 0x40201010, len = 0xd1ff0
1515
}
1616

tools/sdk/ld/eagle.flash.1m192.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MEMORY
1010
{
1111
dport0_0_seg : org = 0x3FF00000, len = 0x10
1212
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13-
iram1_0_seg : org = 0x40100000, len = MMU_IRAM_SIZE
13+
iram1_0_seg : org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
1414
irom0_0_seg : org = 0x40201010, len = 0xc9ff0
1515
}
1616

tools/sdk/ld/eagle.flash.1m256.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MEMORY
1010
{
1111
dport0_0_seg : org = 0x3FF00000, len = 0x10
1212
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13-
iram1_0_seg : org = 0x40100000, len = MMU_IRAM_SIZE
13+
iram1_0_seg : org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
1414
irom0_0_seg : org = 0x40201010, len = 0xb9ff0
1515
}
1616

tools/sdk/ld/eagle.flash.1m512.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MEMORY
1010
{
1111
dport0_0_seg : org = 0x3FF00000, len = 0x10
1212
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13-
iram1_0_seg : org = 0x40100000, len = MMU_IRAM_SIZE
13+
iram1_0_seg : org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
1414
irom0_0_seg : org = 0x40201010, len = 0x79ff0
1515
}
1616

tools/sdk/ld/eagle.flash.1m64.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MEMORY
1010
{
1111
dport0_0_seg : org = 0x3FF00000, len = 0x10
1212
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13-
iram1_0_seg : org = 0x40100000, len = MMU_IRAM_SIZE
13+
iram1_0_seg : org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
1414
irom0_0_seg : org = 0x40201010, len = 0xe9ff0
1515
}
1616

tools/sdk/ld/eagle.flash.2m.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MEMORY
1010
{
1111
dport0_0_seg : org = 0x3FF00000, len = 0x10
1212
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13-
iram1_0_seg : org = 0x40100000, len = MMU_IRAM_SIZE
13+
iram1_0_seg : org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
1414
irom0_0_seg : org = 0x40201010, len = 0xfeff0
1515
}
1616

tools/sdk/ld/eagle.flash.2m128.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MEMORY
1010
{
1111
dport0_0_seg : org = 0x3FF00000, len = 0x10
1212
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13-
iram1_0_seg : org = 0x40100000, len = MMU_IRAM_SIZE
13+
iram1_0_seg : org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
1414
irom0_0_seg : org = 0x40201010, len = 0xfeff0
1515
}
1616

tools/sdk/ld/eagle.flash.2m1m.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MEMORY
1010
{
1111
dport0_0_seg : org = 0x3FF00000, len = 0x10
1212
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13-
iram1_0_seg : org = 0x40100000, len = MMU_IRAM_SIZE
13+
iram1_0_seg : org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
1414
irom0_0_seg : org = 0x40201010, len = 0xfeff0
1515
}
1616

tools/sdk/ld/eagle.flash.2m256.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MEMORY
1010
{
1111
dport0_0_seg : org = 0x3FF00000, len = 0x10
1212
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13-
iram1_0_seg : org = 0x40100000, len = MMU_IRAM_SIZE
13+
iram1_0_seg : org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
1414
irom0_0_seg : org = 0x40201010, len = 0xfeff0
1515
}
1616

tools/sdk/ld/eagle.flash.2m512.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MEMORY
1010
{
1111
dport0_0_seg : org = 0x3FF00000, len = 0x10
1212
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13-
iram1_0_seg : org = 0x40100000, len = MMU_IRAM_SIZE
13+
iram1_0_seg : org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
1414
irom0_0_seg : org = 0x40201010, len = 0xfeff0
1515
}
1616

tools/sdk/ld/eagle.flash.2m64.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MEMORY
1010
{
1111
dport0_0_seg : org = 0x3FF00000, len = 0x10
1212
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13-
iram1_0_seg : org = 0x40100000, len = MMU_IRAM_SIZE
13+
iram1_0_seg : org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
1414
irom0_0_seg : org = 0x40201010, len = 0xfeff0
1515
}
1616

tools/sdk/ld/eagle.flash.4m.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MEMORY
1010
{
1111
dport0_0_seg : org = 0x3FF00000, len = 0x10
1212
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13-
iram1_0_seg : org = 0x40100000, len = MMU_IRAM_SIZE
13+
iram1_0_seg : org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
1414
irom0_0_seg : org = 0x40201010, len = 0xfeff0
1515
}
1616

tools/sdk/ld/eagle.flash.4m1m.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MEMORY
1010
{
1111
dport0_0_seg : org = 0x3FF00000, len = 0x10
1212
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13-
iram1_0_seg : org = 0x40100000, len = MMU_IRAM_SIZE
13+
iram1_0_seg : org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
1414
irom0_0_seg : org = 0x40201010, len = 0xfeff0
1515
}
1616

tools/sdk/ld/eagle.flash.4m2m.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MEMORY
1010
{
1111
dport0_0_seg : org = 0x3FF00000, len = 0x10
1212
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13-
iram1_0_seg : org = 0x40100000, len = MMU_IRAM_SIZE
13+
iram1_0_seg : org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
1414
irom0_0_seg : org = 0x40201010, len = 0xfeff0
1515
}
1616

tools/sdk/ld/eagle.flash.4m3m.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MEMORY
1010
{
1111
dport0_0_seg : org = 0x3FF00000, len = 0x10
1212
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13-
iram1_0_seg : org = 0x40100000, len = MMU_IRAM_SIZE
13+
iram1_0_seg : org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
1414
irom0_0_seg : org = 0x40201010, len = 0xfeff0
1515
}
1616

tools/sdk/ld/eagle.flash.512k.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MEMORY
1010
{
1111
dport0_0_seg : org = 0x3FF00000, len = 0x10
1212
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13-
iram1_0_seg : org = 0x40100000, len = MMU_IRAM_SIZE
13+
iram1_0_seg : org = 0x40100000, len = 0xC000 /* Actual len: IRAM_SIZE */
1414
irom0_0_seg : org = 0x40201010, len = 0x79ff0
1515
}
1616

0 commit comments

Comments
 (0)