Skip to content

Commit 540fdb0

Browse files
ficetoficeto
ficeto
authored and
ficeto
committed
add flash splits depending on the flash size
1 parent 8153edb commit 540fdb0

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

boards.txt

+9
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ generic.build.variant=generic
2323
generic.build.flash_mode=qio
2424
generic.build.flash_size=512K
2525
generic.build.flash_freq=40
26+
generic.build.flash_ld=eagle.flash.512k.ld
2627

2728
generic.menu.CpuFrequency.80=80 MHz
2829
generic.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -50,14 +51,19 @@ generic.menu.UploadSpeed.921600.upload.speed=921600
5051

5152
generic.menu.FlashSize.512K=512K
5253
generic.menu.FlashSize.512K.build.flash_size=512K
54+
generic.menu.FlashSize.512K.build.flash_ld=eagle.flash.512k.ld
5355
generic.menu.FlashSize.256K=256K
5456
generic.menu.FlashSize.256K.build.flash_size=256K
57+
generic.menu.FlashSize.256K.build.flash_ld=eagle.flash.256k.ld
5558
generic.menu.FlashSize.1M=1M
5659
generic.menu.FlashSize.1M.build.flash_size=1M
60+
generic.menu.FlashSize.1M.build.flash_ld=eagle.flash.1m.ld
5761
generic.menu.FlashSize.2M=2M
5862
generic.menu.FlashSize.2M.build.flash_size=2M
63+
generic.menu.FlashSize.2M.build.flash_ld=eagle.flash.2m.ld
5964
generic.menu.FlashSize.4M=4M
6065
generic.menu.FlashSize.4M.build.flash_size=4M
66+
generic.menu.FlashSize.4M.build.flash_ld=eagle.flash.4m.ld
6167

6268
generic.menu.FlashFreq.40=40MHz
6369
generic.menu.FlashFreq.40.build.flash_freq=40
@@ -97,6 +103,7 @@ modwifi.build.variant=generic
97103
modwifi.build.flash_mode=qio
98104
modwifi.build.flash_size=2M
99105
modwifi.build.flash_freq=40
106+
modwifi.build.flash_ld=eagle.flash.2m.ld
100107

101108
modwifi.menu.CpuFrequency.80=80 MHz
102109
modwifi.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -142,6 +149,7 @@ nodemcu.build.variant=nodemcu
142149
nodemcu.build.flash_mode=qio
143150
nodemcu.build.flash_size=4M
144151
nodemcu.build.flash_freq=40
152+
nodemcu.build.flash_ld=eagle.flash.4m.ld
145153

146154
nodemcu.menu.CpuFrequency.80=80 MHz
147155
nodemcu.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -188,6 +196,7 @@ nodemcu.menu.FlashSize.4M.build.flash_size=4M
188196
# wifio.build.flash_mode=qio
189197
# wifio.build.flash_size=512K
190198
# wifio.build.flash_freq=40
199+
# wifio.build.flash_ld=eagle.flash.512k.ld
191200
#
192201
# wifio.menu.CpuFrequency.80=80MHz
193202
# wifio.menu.CpuFrequency.80.build.f_cpu=80000000L

cores/esp8266/spiffs/spiffs_flashmem.c

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "flashmem.h"
2+
#include "esp8266_peri.h"
23

34
// Based on NodeMCU platform_flash
45
// https://github.com/nodemcu/nodemcu-firmware

platform.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ compiler.c.flags=-c -Os -Wpointer-arith -Wno-implicit-function-declaration -Wl,-
2020
compiler.S.cmd=xtensa-lx106-elf-gcc
2121
compiler.S.flags=-c -g -x assembler-with-cpp -MMD
2222

23-
compiler.c.elf.ldscript=eagle.app.v6.ld
24-
compiler.c.elf.flags=-nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" "-T{compiler.c.elf.ldscript}"
23+
compiler.c.elf.flags=-nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" "-T{build.flash_ld}"
2524
compiler.c.elf.cmd=xtensa-lx106-elf-gcc
2625
compiler.c.elf.libs=-lm -lgcc -lhal -lphy -lnet80211 -llwip -lwpa -lmain -lpp -lsmartconfig
2726

0 commit comments

Comments
 (0)