Skip to content

Commit b443e43

Browse files
committed
Interesting glitch in boards.txt after github merge. A new board in
master was missing new additions added by boards.txt.py in the PR. Which the CI flags when it rebuilds boards.txt.
1 parent 5bb3e19 commit b443e43

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

boards.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6985,6 +6985,16 @@ eduinowifi.menu.ssl.all=All SSL ciphers (most compatible)
69856985
eduinowifi.menu.ssl.all.build.sslflags=
69866986
eduinowifi.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
69876987
eduinowifi.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
6988+
eduinowifi.menu.mmu.3232=32KB cache + 32KB IRAM (balanced)
6989+
eduinowifi.menu.mmu.3232.build.mmuflags=-DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x8000
6990+
eduinowifi.menu.mmu.4816=16KB cache + 48KB IRAM (IRAM)
6991+
eduinowifi.menu.mmu.4816.build.mmuflags=-DMMU_IRAM_SIZE=0xC000 -DMMU_ICACHE_SIZE=0x4000
6992+
eduinowifi.menu.mmu.3216=16KB cache + 32KB IRAM + 16KB sec heap (Heap)
6993+
eduinowifi.menu.mmu.3216.build.mmuflags=-DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x4000 -DMMU_SEC_HEAP=0x40108000 -DMMU_SEC_HEAP_SIZE=0x4000
6994+
eduinowifi.menu.non32xfer.fast=Use pgm_read macros for IRAM/PROGMEM
6995+
eduinowifi.menu.non32xfer.fast.build.non32xferflags=
6996+
eduinowifi.menu.non32xfer.safe=Byte/Word access to IRAM/PROGMEM (very slow)
6997+
eduinowifi.menu.non32xfer.safe.build.non32xferflags=-DNON32XFER_HANDLER
69886998
eduinowifi.upload.resetmethod=--before default_reset --after hard_reset
69896999
eduinowifi.build.flash_mode=dio
69907000
eduinowifi.build.flash_flags=-DFLASHMODE_DIO

cores/esp8266/mmu_iram.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,11 @@ extern mmu_cre_status_t mmu_status;
4747

4848
#ifdef DEBUG_MMU
4949
static inline bool is_iram(uint32_t addr) {
50-
constexpr uint32_t iram_start = 0x40100000u;
50+
constexpr uint32_t iram_start = 0x40100000u;
51+
52+
#ifndef MMU_IRAM_SIZE
53+
#define MMU_IRAM_SIZE 0x8000
54+
#endif
5155

5256
#ifdef MMU_SEC_HEAP_SIZE
5357
constexpr uint32_t iram_end = iram_start + MMU_IRAM_SIZE + MMU_SEC_HEAP_SIZE;

package/package_esp8266com_index.template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,4 +378,4 @@
378378
]
379379
}
380380
]
381-
}
381+
}

0 commit comments

Comments
 (0)