Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

boards generator: updates #5103

Merged
merged 5 commits into from
Sep 3, 2018
Merged

boards generator: updates #5103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9bc9e90
boards generator: updates:
d-a-v Sep 3, 2018
bed6589
trying to reduce hidden strings's length in boards.txt (#5100)
d-a-v Sep 3, 2018
89ed23b
update device test framework
d-a-v Sep 3, 2018
36da1cc
+ build.py update + details (rf-cal and sdk-wifi-settings)
d-a-v Sep 3, 2018
3ab0335
update ld comments
d-a-v Sep 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8,436 changes: 4,325 additions & 4,111 deletions boards.txt
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion tests/device/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ UPLOAD_BAUD ?= 921600
UPLOAD_BOARD ?= nodemcu
BS_DIR ?= libraries/BSTest
DEBUG_LEVEL ?= DebugLevel=None____
FQBN ?= esp8266com:esp8266:generic:CpuFrequency=80,FlashFreq=40,FlashMode=dio,UploadSpeed=115200,FlashSize=4M1M,LwIPVariant=v2mss536,ResetMethod=none,Debug=Serial,$(DEBUG_LEVEL)
#FQBN ?= esp8266com:esp8266:generic:CpuFrequency=80,FlashFreq=40,FlashMode=dio,UploadSpeed=115200,FlashSize=4M1M,LwIPVariant=v2mss536,ResetMethod=none,Debug=Serial,$(DEBUG_LEVEL)
FQBN ?= esp8266com:esp8266:generic:xtal=80,FlashFreq=40,FlashMode=dio,baud=115200,eesz=4M1M,ip=lm2,ResetMethod=none,dbg=Serial,$(DEBUG_LEVEL)
BUILD_TOOL := $(ARDUINO_IDE_PATH)/arduino-builder
TEST_CONFIG := test_env.cfg
TEST_REPORT_XML := test_report.xml
Expand Down
287 changes: 172 additions & 115 deletions tools/boards.txt.py
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions tools/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ def compile(tmp_dir, sketch, tools_dir, hardware_dir, ide_path, f, args):
cmd += '-hardware "' + hardware_dir + '" '
# Debug=Serial,DebugLevel=Core____
cmd += '-fqbn=esp8266com:esp8266:{board_name}:' \
'CpuFrequency={cpu_freq},' \
'xtal={cpu_freq},' \
'FlashFreq={flash_freq},' \
'FlashMode={flash_mode},' \
'UploadSpeed=921600,' \
'FlashSize={flash_size},' \
'baud=921600,' \
'eesz={flash_size},' \
'ResetMethod=nodemcu'.format(**vars(args))
if args.debug_port and args.debug_level:
cmd += 'Debug={debug_port},DebugLevel={debug_level}'.format(**vars(args))
cmd += 'dbg={debug_port},lvl={debug_level}'.format(**vars(args))
cmd += ' '
cmd += '-ide-version=10607 '
cmd += '-warnings={warnings} '.format(**vars(args))
Expand Down
22 changes: 22 additions & 0 deletions tools/sdk/ld/eagle.flash.16m14m.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/* Flash Split for 16M chips */
/* sketch @0x40200000 (~1019KB) (1044464B) */
/* empty @0x402FEFF0 (~1028KB) (1052688B) */
/* spiffs @0x40400000 (~14316KB) (14659584B) */
/* eeprom @0x411FB000 (=4KB) */
/* rfcal @0x411FC000 (=4KB) */
/* wifi @0x411FD000 (=12KB) */

MEMORY
{
dport0_0_seg : org = 0x3FF00000, len = 0x10
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
iram1_0_seg : org = 0x40100000, len = 0x8000
irom0_0_seg : org = 0x40201010, len = 0xfeff0
}

PROVIDE ( _SPIFFS_start = 0x40400000 );
PROVIDE ( _SPIFFS_end = 0x411FB000 );
PROVIDE ( _SPIFFS_page = 0x100 );
PROVIDE ( _SPIFFS_block = 0x2000 );

INCLUDE "eagle.app.v6.common.ld"
9 changes: 6 additions & 3 deletions tools/sdk/ld/eagle.flash.16m.ld → tools/sdk/ld/eagle.flash.16m15m.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
/* Flash Split for 16M chips */
/* sketch 1019KB */
/* spiffs 15340KB */
/* eeprom 20KB */
/* sketch @0x40200000 (~1019KB) (1044464B) */
/* empty @0x402FEFF0 (~4KB) (4112B) */
/* spiffs @0x40300000 (~15340KB) (15708160B) */
/* eeprom @0x411FB000 (=4KB) */
/* rfcal @0x411FC000 (=4KB) */
/* wifi @0x411FD000 (=12KB) */

MEMORY
{
Expand Down
10 changes: 4 additions & 6 deletions tools/sdk/ld/eagle.flash.1m0.ld → tools/sdk/ld/eagle.flash.1m.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/* Flash Split for 1M chips */
/* sketch 999KB */
/* eeprom 20KB */
/* sketch @0x40200000 (~999KB) (1023984B) */
/* eeprom @0x402FB000 (=4KB) */
/* rfcal @0x402FC000 (=4KB) */
/* wifi @0x402FD000 (=12KB) */

MEMORY
{
Expand All @@ -10,9 +12,5 @@ MEMORY
irom0_0_seg : org = 0x40201010, len = 0xf9ff0
}

PROVIDE ( _SPIFFS_start = 0x402FB000 );
PROVIDE ( _SPIFFS_end = 0x402FB000 );
PROVIDE ( _SPIFFS_page = 0x0 );
PROVIDE ( _SPIFFS_block = 0x0 );

INCLUDE "eagle.app.v6.common.ld"
9 changes: 6 additions & 3 deletions tools/sdk/ld/eagle.flash.1m128.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
/* Flash Split for 1M chips */
/* sketch 871KB */
/* spiffs 128KB */
/* eeprom 20KB */
/* sketch @0x40200000 (~871KB) (892912B) */
/* empty @0x402D9FF0 (~4KB) (4112B) */
/* spiffs @0x402DB000 (~128KB) (131072B) */
/* eeprom @0x402FB000 (=4KB) */
/* rfcal @0x402FC000 (=4KB) */
/* wifi @0x402FD000 (=12KB) */

MEMORY
{
Expand Down
9 changes: 6 additions & 3 deletions tools/sdk/ld/eagle.flash.1m144.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
/* Flash Split for 1M chips */
/* sketch 855KB */
/* spiffs 144KB */
/* eeprom 20KB */
/* sketch @0x40200000 (~855KB) (876528B) */
/* empty @0x402D5FF0 (~4KB) (4112B) */
/* spiffs @0x402D7000 (~144KB) (147456B) */
/* eeprom @0x402FB000 (=4KB) */
/* rfcal @0x402FC000 (=4KB) */
/* wifi @0x402FD000 (=12KB) */

MEMORY
{
Expand Down
9 changes: 6 additions & 3 deletions tools/sdk/ld/eagle.flash.1m160.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
/* Flash Split for 1M chips */
/* sketch 839KB */
/* spiffs 160KB */
/* eeprom 20KB */
/* sketch @0x40200000 (~839KB) (860144B) */
/* empty @0x402D1FF0 (~4KB) (4112B) */
/* spiffs @0x402D3000 (~160KB) (163840B) */
/* eeprom @0x402FB000 (=4KB) */
/* rfcal @0x402FC000 (=4KB) */
/* wifi @0x402FD000 (=12KB) */

MEMORY
{
Expand Down
9 changes: 6 additions & 3 deletions tools/sdk/ld/eagle.flash.1m192.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
/* Flash Split for 1M chips */
/* sketch 807KB */
/* spiffs 192KB */
/* eeprom 20KB */
/* sketch @0x40200000 (~807KB) (827376B) */
/* empty @0x402C9FF0 (~4KB) (4112B) */
/* spiffs @0x402CB000 (~192KB) (196608B) */
/* eeprom @0x402FB000 (=4KB) */
/* rfcal @0x402FC000 (=4KB) */
/* wifi @0x402FD000 (=12KB) */

MEMORY
{
Expand Down
9 changes: 6 additions & 3 deletions tools/sdk/ld/eagle.flash.1m256.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
/* Flash Split for 1M chips */
/* sketch 743KB */
/* spiffs 256KB */
/* eeprom 20KB */
/* sketch @0x40200000 (~743KB) (761840B) */
/* empty @0x402B9FF0 (~4KB) (4112B) */
/* spiffs @0x402BB000 (~256KB) (262144B) */
/* eeprom @0x402FB000 (=4KB) */
/* rfcal @0x402FC000 (=4KB) */
/* wifi @0x402FD000 (=12KB) */

MEMORY
{
Expand Down
9 changes: 6 additions & 3 deletions tools/sdk/ld/eagle.flash.1m512.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
/* Flash Split for 1M chips */
/* sketch 487KB */
/* spiffs 512KB */
/* eeprom 20KB */
/* sketch @0x40200000 (~487KB) (499696B) */
/* empty @0x40279FF0 (~4KB) (4112B) */
/* spiffs @0x4027B000 (~512KB) (524288B) */
/* eeprom @0x402FB000 (=4KB) */
/* rfcal @0x402FC000 (=4KB) */
/* wifi @0x402FD000 (=12KB) */

MEMORY
{
Expand Down
9 changes: 6 additions & 3 deletions tools/sdk/ld/eagle.flash.1m64.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
/* Flash Split for 1M chips */
/* sketch 935KB */
/* spiffs 64KB */
/* eeprom 20KB */
/* sketch @0x40200000 (~935KB) (958448B) */
/* empty @0x402E9FF0 (~4KB) (4112B) */
/* spiffs @0x402EB000 (~64KB) (65536B) */
/* eeprom @0x402FB000 (=4KB) */
/* rfcal @0x402FC000 (=4KB) */
/* wifi @0x402FD000 (=12KB) */

MEMORY
{
Expand Down
11 changes: 4 additions & 7 deletions tools/sdk/ld/eagle.flash.2m.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/* Flash Split for 2M chips */
/* sketch 1019KB */
/* spiffs 1004KB */
/* eeprom 20KB */
/* sketch @0x40200000 (~1019KB) (1044464B) */
/* eeprom @0x403FB000 (=4KB) */
/* rfcal @0x403FC000 (=4KB) */
/* wifi @0x403FD000 (=12KB) */

MEMORY
{
Expand All @@ -11,9 +12,5 @@ MEMORY
irom0_0_seg : org = 0x40201010, len = 0xfeff0
}

PROVIDE ( _SPIFFS_start = 0x40300000 );
PROVIDE ( _SPIFFS_end = 0x403FB000 );
PROVIDE ( _SPIFFS_page = 0x100 );
PROVIDE ( _SPIFFS_block = 0x2000 );

INCLUDE "eagle.app.v6.common.ld"
22 changes: 22 additions & 0 deletions tools/sdk/ld/eagle.flash.2m1m.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/* Flash Split for 2M chips */
/* sketch @0x40200000 (~1019KB) (1044464B) */
/* empty @0x402FEFF0 (~4KB) (4112B) */
/* spiffs @0x40300000 (~1004KB) (1028096B) */
/* eeprom @0x403FB000 (=4KB) */
/* rfcal @0x403FC000 (=4KB) */
/* wifi @0x403FD000 (=12KB) */

MEMORY
{
dport0_0_seg : org = 0x3FF00000, len = 0x10
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
iram1_0_seg : org = 0x40100000, len = 0x8000
irom0_0_seg : org = 0x40201010, len = 0xfeff0
}

PROVIDE ( _SPIFFS_start = 0x40300000 );
PROVIDE ( _SPIFFS_end = 0x403FB000 );
PROVIDE ( _SPIFFS_page = 0x100 );
PROVIDE ( _SPIFFS_block = 0x2000 );

INCLUDE "eagle.app.v6.common.ld"
22 changes: 22 additions & 0 deletions tools/sdk/ld/eagle.flash.2m512.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/* Flash Split for 2M chips */
/* sketch @0x40200000 (~1019KB) (1044464B) */
/* empty @0x402FEFF0 (~516KB) (528400B) */
/* spiffs @0x40380000 (~492KB) (503808B) */
/* eeprom @0x403FB000 (=4KB) */
/* rfcal @0x403FC000 (=4KB) */
/* wifi @0x403FD000 (=12KB) */

MEMORY
{
dport0_0_seg : org = 0x3FF00000, len = 0x10
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
iram1_0_seg : org = 0x40100000, len = 0x8000
irom0_0_seg : org = 0x40201010, len = 0xfeff0
}

PROVIDE ( _SPIFFS_start = 0x40380000 );
PROVIDE ( _SPIFFS_end = 0x403FB000 );
PROVIDE ( _SPIFFS_page = 0x100 );
PROVIDE ( _SPIFFS_block = 0x2000 );

INCLUDE "eagle.app.v6.common.ld"
11 changes: 4 additions & 7 deletions tools/sdk/ld/eagle.flash.4m.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/* Flash Split for 4M chips */
/* sketch 1019KB */
/* spiffs 3052KB */
/* eeprom 20KB */
/* sketch @0x40200000 (~1019KB) (1044464B) */
/* eeprom @0x405FB000 (=4KB) */
/* rfcal @0x405FC000 (=4KB) */
/* wifi @0x405FD000 (=12KB) */

MEMORY
{
Expand All @@ -11,9 +12,5 @@ MEMORY
irom0_0_seg : org = 0x40201010, len = 0xfeff0
}

PROVIDE ( _SPIFFS_start = 0x40300000 );
PROVIDE ( _SPIFFS_end = 0x405FB000 );
PROVIDE ( _SPIFFS_page = 0x100 );
PROVIDE ( _SPIFFS_block = 0x2000 );

INCLUDE "eagle.app.v6.common.ld"
10 changes: 6 additions & 4 deletions tools/sdk/ld/eagle.flash.4m1m.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/* Flash Split for 4M chips */
/* sketch 1019KB */
/* empty 2048KB */
/* spiffs 1004KB */
/* eeprom 20KB */
/* sketch @0x40200000 (~1019KB) (1044464B) */
/* empty @0x402FEFF0 (~2052KB) (2101264B) */
/* spiffs @0x40500000 (~1004KB) (1028096B) */
/* eeprom @0x405FB000 (=4KB) */
/* rfcal @0x405FC000 (=4KB) */
/* wifi @0x405FD000 (=12KB) */

MEMORY
{
Expand Down
10 changes: 6 additions & 4 deletions tools/sdk/ld/eagle.flash.4m2m.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/* Flash Split for 4M chips */
/* sketch 1019KB */
/* empty 1024KB */
/* spiffs 2028KB */
/* eeprom 20KB */
/* sketch @0x40200000 (~1019KB) (1044464B) */
/* empty @0x402FEFF0 (~1028KB) (1052688B) */
/* spiffs @0x40400000 (~2028KB) (2076672B) */
/* eeprom @0x405FB000 (=4KB) */
/* rfcal @0x405FC000 (=4KB) */
/* wifi @0x405FD000 (=12KB) */

MEMORY
{
Expand Down
22 changes: 22 additions & 0 deletions tools/sdk/ld/eagle.flash.4m3m.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/* Flash Split for 4M chips */
/* sketch @0x40200000 (~1019KB) (1044464B) */
/* empty @0x402FEFF0 (~4KB) (4112B) */
/* spiffs @0x40300000 (~3052KB) (3125248B) */
/* eeprom @0x405FB000 (=4KB) */
/* rfcal @0x405FC000 (=4KB) */
/* wifi @0x405FD000 (=12KB) */

MEMORY
{
dport0_0_seg : org = 0x3FF00000, len = 0x10
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
iram1_0_seg : org = 0x40100000, len = 0x8000
irom0_0_seg : org = 0x40201010, len = 0xfeff0
}

PROVIDE ( _SPIFFS_start = 0x40300000 );
PROVIDE ( _SPIFFS_end = 0x405FB000 );
PROVIDE ( _SPIFFS_page = 0x100 );
PROVIDE ( _SPIFFS_block = 0x2000 );

INCLUDE "eagle.app.v6.common.ld"
10 changes: 4 additions & 6 deletions tools/sdk/ld/eagle.flash.512k0.ld → tools/sdk/ld/eagle.flash.512k.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/* Flash Split for 512K chips */
/* sketch 487KB */
/* eeprom 20KB */
/* sketch @0x40200000 (~487KB) (499696B) */
/* eeprom @0x4027B000 (=4KB) */
/* rfcal @0x4027C000 (=4KB) */
/* wifi @0x4027D000 (=12KB) */

MEMORY
{
Expand All @@ -10,9 +12,5 @@ MEMORY
irom0_0_seg : org = 0x40201010, len = 0x79ff0
}

PROVIDE ( _SPIFFS_start = 0x4027B000 );
PROVIDE ( _SPIFFS_end = 0x4027B000 );
PROVIDE ( _SPIFFS_page = 0x0 );
PROVIDE ( _SPIFFS_block = 0x0 );

INCLUDE "eagle.app.v6.common.ld"
9 changes: 6 additions & 3 deletions tools/sdk/ld/eagle.flash.512k128.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
/* Flash Split for 512K chips */
/* sketch 359KB */
/* spiffs 128KB */
/* eeprom 20KB */
/* sketch @0x40200000 (~359KB) (368624B) */
/* empty @0x40259FF0 (~4KB) (4112B) */
/* spiffs @0x4025B000 (~128KB) (131072B) */
/* eeprom @0x4027B000 (=4KB) */
/* rfcal @0x4027C000 (=4KB) */
/* wifi @0x4027D000 (=12KB) */

MEMORY
{
Expand Down
9 changes: 6 additions & 3 deletions tools/sdk/ld/eagle.flash.512k32.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
/* Flash Split for 512K chips */
/* sketch 455KB */
/* spiffs 32KB */
/* eeprom 20KB */
/* sketch @0x40200000 (~455KB) (466928B) */
/* empty @0x40271FF0 (~4KB) (4112B) */
/* spiffs @0x40273000 (~32KB) (32768B) */
/* eeprom @0x4027B000 (=4KB) */
/* rfcal @0x4027C000 (=4KB) */
/* wifi @0x4027D000 (=12KB) */

MEMORY
{
Expand Down
9 changes: 6 additions & 3 deletions tools/sdk/ld/eagle.flash.512k64.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
/* Flash Split for 512K chips */
/* sketch 423KB */
/* spiffs 64KB */
/* eeprom 20KB */
/* sketch @0x40200000 (~423KB) (434160B) */
/* empty @0x40269FF0 (~4KB) (4112B) */
/* spiffs @0x4026B000 (~64KB) (65536B) */
/* eeprom @0x4027B000 (=4KB) */
/* rfcal @0x4027C000 (=4KB) */
/* wifi @0x4027D000 (=12KB) */

MEMORY
{
Expand Down
Loading