Skip to content

Commit cc0bfa0

Browse files
d-a-vd-a-v
authored
boards generator: updates (#5103)
boards generator updates: * simplified mapping description: only flash and spiffs sizes are needed * some ldscripts are renamed due to autogenerated names * +2M/0, +2M/512K spiffs, +4M0 * reduce length of hidden strings in boards.txt (#5100, arduino/arduino-builder#284) * give more details in ldscripts (address, size, +rf-cal, +sdk-wifi-settings)
1 parent c33ef89 commit cc0bfa0

27 files changed

+4713
-4301
lines changed

‎boards.txt‎

Lines changed: 4325 additions & 4111 deletions
Large diffs are not rendered by default.

‎tests/device/Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ UPLOAD_BAUD ?= 921600
1010
UPLOAD_BOARD ?= nodemcu
1111
BS_DIR ?= libraries/BSTest
1212
DEBUG_LEVEL ?= DebugLevel=None____
13-
FQBN ?= esp8266com:esp8266:generic:CpuFrequency=80,FlashFreq=40,FlashMode=dio,UploadSpeed=115200,FlashSize=4M1M,LwIPVariant=v2mss536,ResetMethod=none,Debug=Serial,$(DEBUG_LEVEL)
13+
#FQBN ?= esp8266com:esp8266:generic:CpuFrequency=80,FlashFreq=40,FlashMode=dio,UploadSpeed=115200,FlashSize=4M1M,LwIPVariant=v2mss536,ResetMethod=none,Debug=Serial,$(DEBUG_LEVEL)
14+
FQBN ?= esp8266com:esp8266:generic:xtal=80,FlashFreq=40,FlashMode=dio,baud=115200,eesz=4M1M,ip=lm2,ResetMethod=none,dbg=Serial,$(DEBUG_LEVEL)
1415
BUILD_TOOL := $(ARDUINO_IDE_PATH)/arduino-builder
1516
TEST_CONFIG := test_env.cfg
1617
TEST_REPORT_XML := test_report.xml

‎tools/boards.txt.py‎

Lines changed: 172 additions & 115 deletions
Large diffs are not rendered by default.

‎tools/build.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ def compile(tmp_dir, sketch, tools_dir, hardware_dir, ide_path, f, args):
4545
cmd += '-hardware "' + hardware_dir + '" '
4646
# Debug=Serial,DebugLevel=Core____
4747
cmd += '-fqbn=esp8266com:esp8266:{board_name}:' \
48-
'CpuFrequency={cpu_freq},' \
48+
'xtal={cpu_freq},' \
4949
'FlashFreq={flash_freq},' \
5050
'FlashMode={flash_mode},' \
51-
'UploadSpeed=921600,' \
52-
'FlashSize={flash_size},' \
51+
'baud=921600,' \
52+
'eesz={flash_size},' \
5353
'ResetMethod=nodemcu'.format(**vars(args))
5454
if args.debug_port and args.debug_level:
55-
cmd += 'Debug={debug_port},DebugLevel={debug_level}'.format(**vars(args))
55+
cmd += 'dbg={debug_port},lvl={debug_level}'.format(**vars(args))
5656
cmd += ' '
5757
cmd += '-ide-version=10607 '
5858
cmd += '-warnings={warnings} '.format(**vars(args))

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/* Flash Split for 16M chips */
2+
/* sketch @0x40200000 (~1019KB) (1044464B) */
3+
/* empty @0x402FEFF0 (~1028KB) (1052688B) */
4+
/* spiffs @0x40400000 (~14316KB) (14659584B) */
5+
/* eeprom @0x411FB000 (=4KB) */
6+
/* rfcal @0x411FC000 (=4KB) */
7+
/* wifi @0x411FD000 (=12KB) */
8+
9+
MEMORY
10+
{
11+
dport0_0_seg : org = 0x3FF00000, len = 0x10
12+
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13+
iram1_0_seg : org = 0x40100000, len = 0x8000
14+
irom0_0_seg : org = 0x40201010, len = 0xfeff0
15+
}
16+
17+
PROVIDE ( _SPIFFS_start = 0x40400000 );
18+
PROVIDE ( _SPIFFS_end = 0x411FB000 );
19+
PROVIDE ( _SPIFFS_page = 0x100 );
20+
PROVIDE ( _SPIFFS_block = 0x2000 );
21+
22+
INCLUDE "eagle.app.v6.common.ld"

‎tools/sdk/ld/eagle.flash.16m.ld‎ renamed to ‎tools/sdk/ld/eagle.flash.16m15m.ld‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
/* Flash Split for 16M chips */
2-
/* sketch 1019KB */
3-
/* spiffs 15340KB */
4-
/* eeprom 20KB */
2+
/* sketch @0x40200000 (~1019KB) (1044464B) */
3+
/* empty @0x402FEFF0 (~4KB) (4112B) */
4+
/* spiffs @0x40300000 (~15340KB) (15708160B) */
5+
/* eeprom @0x411FB000 (=4KB) */
6+
/* rfcal @0x411FC000 (=4KB) */
7+
/* wifi @0x411FD000 (=12KB) */
58

69
MEMORY
710
{

‎tools/sdk/ld/eagle.flash.1m0.ld‎ renamed to ‎tools/sdk/ld/eagle.flash.1m.ld‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/* Flash Split for 1M chips */
2-
/* sketch 999KB */
3-
/* eeprom 20KB */
2+
/* sketch @0x40200000 (~999KB) (1023984B) */
3+
/* eeprom @0x402FB000 (=4KB) */
4+
/* rfcal @0x402FC000 (=4KB) */
5+
/* wifi @0x402FD000 (=12KB) */
46

57
MEMORY
68
{
@@ -10,9 +12,5 @@ MEMORY
1012
irom0_0_seg : org = 0x40201010, len = 0xf9ff0
1113
}
1214

13-
PROVIDE ( _SPIFFS_start = 0x402FB000 );
14-
PROVIDE ( _SPIFFS_end = 0x402FB000 );
15-
PROVIDE ( _SPIFFS_page = 0x0 );
16-
PROVIDE ( _SPIFFS_block = 0x0 );
1715

1816
INCLUDE "eagle.app.v6.common.ld"

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
/* Flash Split for 1M chips */
2-
/* sketch 871KB */
3-
/* spiffs 128KB */
4-
/* eeprom 20KB */
2+
/* sketch @0x40200000 (~871KB) (892912B) */
3+
/* empty @0x402D9FF0 (~4KB) (4112B) */
4+
/* spiffs @0x402DB000 (~128KB) (131072B) */
5+
/* eeprom @0x402FB000 (=4KB) */
6+
/* rfcal @0x402FC000 (=4KB) */
7+
/* wifi @0x402FD000 (=12KB) */
58

69
MEMORY
710
{

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
/* Flash Split for 1M chips */
2-
/* sketch 855KB */
3-
/* spiffs 144KB */
4-
/* eeprom 20KB */
2+
/* sketch @0x40200000 (~855KB) (876528B) */
3+
/* empty @0x402D5FF0 (~4KB) (4112B) */
4+
/* spiffs @0x402D7000 (~144KB) (147456B) */
5+
/* eeprom @0x402FB000 (=4KB) */
6+
/* rfcal @0x402FC000 (=4KB) */
7+
/* wifi @0x402FD000 (=12KB) */
58

69
MEMORY
710
{

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
/* Flash Split for 1M chips */
2-
/* sketch 839KB */
3-
/* spiffs 160KB */
4-
/* eeprom 20KB */
2+
/* sketch @0x40200000 (~839KB) (860144B) */
3+
/* empty @0x402D1FF0 (~4KB) (4112B) */
4+
/* spiffs @0x402D3000 (~160KB) (163840B) */
5+
/* eeprom @0x402FB000 (=4KB) */
6+
/* rfcal @0x402FC000 (=4KB) */
7+
/* wifi @0x402FD000 (=12KB) */
58

69
MEMORY
710
{

0 commit comments

Comments
 (0)