Skip to content

added 2M generic boards #5404

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

Merged
merged 13 commits into from
Dec 1, 2018
Merged

added 2M generic boards #5404

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
82f9afe
added generic boards
Nov 30, 2018
b0945b1
Merge branch 'master' into added_2M_boards_flash_mapping
apicquot Nov 30, 2018
ac24693
removed unecessary files
Nov 30, 2018
ae166c4
Merge branch 'added_2M_boards_flash_mapping' of https://github.com/ap…
Nov 30, 2018
063d8de
fixed name issue
Nov 30, 2018
b271581
removes orig file
apicquot Nov 30, 2018
498369d
Delete package_esp8266com_index.template.json.orig
apicquot Nov 30, 2018
6acbab8
restored:
apicquot Dec 1, 2018
de8fc03
Merge branch 'master' into added_2M_boards_flash_mapping
apicquot Dec 1, 2018
523feca
keeping boards.txt.py
apicquot Dec 1, 2018
6b29219
Merge branch 'added_2M_boards_flash_mapping' of https://github.com/ap…
apicquot Dec 1, 2018
799ba10
using python 2.7 for running boards.txt.py
apicquot Dec 1, 2018
6f71c14
Merge branch 'master' into added_2M_boards_flash_mapping
apicquot Dec 1, 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
2,638 changes: 1,349 additions & 1,289 deletions boards.txt
View file
Open in desktop

Large diffs are not rendered by default.

5,660 changes: 5,660 additions & 0 deletions boards.txt.orig
View file
Open in desktop

Large diffs are not rendered by default.

441 changes: 441 additions & 0 deletions doc/boards.rst.orig
View file
Open in desktop

Large diffs are not rendered by default.

278 changes: 278 additions & 0 deletions package/package_esp8266com_index.template.json.orig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,278 @@
{
"packages": [
{
"name": "esp8266",
"maintainer": "ESP8266 Community",
"websiteURL": "https://github.com/esp8266/Arduino",
"email": "[email protected]",
"help": {
"online": "http://esp8266.com/arduino"
},
"platforms": [
{
"name": "esp8266",
"architecture": "esp8266",
"version": "",
"category": "ESP8266",
"url": "",
"archiveFileName": "",
"help": {
"online": ""
},
"boards": [
{
"name": "Generic ESP8266 Module"
},
{
"name": "Generic ESP8285 Module"
},
{
"name": "ESPDuino (ESP-13 Module)"
},
{
"name": "Adafruit Feather HUZZAH ESP8266"
},
{
"name": "Invent One"
},
{
"name": "XinaBox CW01"
},
{
"name": "ESPresso Lite 1.0"
},
{
"name": "ESPresso Lite 2.0"
},
{
"name": "Phoenix 1.0"
},
{
"name": "Phoenix 2.0"
},
{
"name": "NodeMCU 0.9 (ESP-12 Module)"
},
{
"name": "NodeMCU 1.0 (ESP-12E Module)"
},
{
"name": "Olimex MOD-WIFI-ESP8266(-DEV)"
},
{
"name": "SparkFun ESP8266 Thing"
},
{
"name": "SparkFun ESP8266 Thing Dev"
},
{
"name": "SweetPea ESP-210"
},
{
"name": "LOLIN(WEMOS) D1 R2 & mini"
},
{
"name": "LOLIN(WEMOS) D1 mini Pro"
},
{
"name": "LOLIN(WEMOS) D1 mini Lite"
},
{
"name": "WeMos D1 R1"
},
{
"name": "ESPino (ESP-12 Module)"
},
{
"name": "ThaiEasyElec's ESPino"
},
{
"name": "WifInfo"
},
{
"name": "Arduino"
},
{
"name": "4D Systems gen4 IoD Range"
},
{
"name": "Digistump Oak"
},
{
"name": "WiFiduino"
},
{
"name": "Amperka WiFi Slot"
},
{
"name": "Seeed Wio Link"
}
],
"toolsDependencies": [
{
"packager": "esp8266",
"name": "esptool",
"version": "0.4.13"
},
{
"packager": "esp8266",
"name": "xtensa-lx106-elf-gcc",
"version": "1.20.0-26-gb404fb9-2"
},
{
"packager": "esp8266",
"name": "mkspiffs",
"version": "0.2.0"
}
]
}
],
"tools": [
{
"name": "esptool",
"version": "0.4.13",
"systems": [
{
"host": "i686-mingw32",
"url": "https://github.com/igrr/esptool-ck/releases/download/0.4.13/esptool-0.4.13-win32.zip",
"archiveFileName": "esptool-0.4.13-win32.zip",
"checksum": "SHA-256:17c1035aacd8f6dbfbc04ed899f5db0ceba60820592705a9c6011476ab8d1687",
"size": "16660"
},
{
"host": "x86_64-apple-darwin",
"url": "https://github.com/igrr/esptool-ck/releases/download/0.4.13/esptool-0.4.13-osx.tar.gz",
"archiveFileName": "esptool-0.4.13-osx.tar.gz",
"checksum": "SHA-256:a24a973c3b2671992a8b66f4e7c9ffd24065972f241469f45e94a0a66d118d23",
"size": "32362"
},
{
"host": "i386-apple-darwin",
"url": "https://github.com/igrr/esptool-ck/releases/download/0.4.13/esptool-0.4.13-osx.tar.gz",
"archiveFileName": "esptool-0.4.13-osx.tar.gz",
"checksum": "SHA-256:a24a973c3b2671992a8b66f4e7c9ffd24065972f241469f45e94a0a66d118d23",
"size": "32362"
},
{
"host": "x86_64-pc-linux-gnu",
"url": "https://github.com/igrr/esptool-ck/releases/download/0.4.13/esptool-0.4.13-linux64.tar.gz",
"archiveFileName": "esptool-0.4.13-linux64.tar.gz",
"checksum": "SHA-256:3c35f366ffdaa1328b1e96e28c9a97f60c98109095ccc18352fb5615e582a786",
"size": "15743"
},
{
"host": "i686-pc-linux-gnu",
"url": "https://github.com/igrr/esptool-ck/releases/download/0.4.13/esptool-0.4.13-linux32.tar.gz",
"archiveFileName": "esptool-0.4.13-linux32.tar.gz",
"checksum": "SHA-256:041f661a41a2efb40c89fc34acf0059bbb5e1eb1c050efaa69af677f79c966fb",
"size": "14884"
},
{
"host": "arm-linux-gnueabihf",
"url": "https://github.com/igrr/esptool-ck/releases/download/0.4.13/esptool-0.4.13-linux-armhf.tar.gz",
"archiveFileName": "esptool-0.4.13-linux-armhf.tar.gz",
"checksum": "SHA-256:3a627e2678e0c317122543883ae8a00e82149769414b9d5733f23526fb28a423",
"size": "13259"
}
]
},
{
"name": "xtensa-lx106-elf-gcc",
"version": "1.20.0-26-gb404fb9-2",
"systems": [
{
"host": "i686-mingw32",
"url": "https://github.com/esp8266/Arduino/releases/download/2.3.0/win32-xtensa-lx106-elf-gb404fb9-2.tar.gz",
"archiveFileName": "win32-xtensa-lx106-elf-gb404fb9-2.tar.gz",
"checksum": "SHA-256:10476b9c11a7a90f40883413ddfb409f505b20692e316c4e597c4c175b4be09c",
"size": "153527527"
},
{
"host": "x86_64-apple-darwin",
"url": "https://github.com/esp8266/Arduino/releases/download/2.3.0/osx-xtensa-lx106-elf-gb404fb9-2.tar.gz",
"archiveFileName": "osx-xtensa-lx106-elf-gb404fb9-2.tar.gz",
"checksum": "SHA-256:0cf150193997bd1355e0f49d3d49711730035257bc1aee1eaaad619e56b9e4e6",
"size": "35385382"
},
{
"host": "i386-apple-darwin",
"url": "https://github.com/esp8266/Arduino/releases/download/2.3.0/osx-xtensa-lx106-elf-gb404fb9-2.tar.gz",
"archiveFileName": "osx-xtensa-lx106-elf-gb404fb9-2.tar.gz",
"checksum": "SHA-256:0cf150193997bd1355e0f49d3d49711730035257bc1aee1eaaad619e56b9e4e6",
"size": "35385382"
},
{
"host": "x86_64-pc-linux-gnu",
"url": "https://github.com/esp8266/Arduino/releases/download/2.3.0/linux64-xtensa-lx106-elf-gb404fb9.tgz",
"archiveFileName": "linux64-xtensa-lx106-elf-gb404fb9.tar.gz",
"checksum": "SHA-256:46f057fbd8b320889a26167daf325038912096d09940b2a95489db92431473b7",
"size": "30262903"
},
{
"host": "i686-pc-linux-gnu",
"url": "https://github.com/esp8266/Arduino/releases/download/2.3.0/linux32-xtensa-lx106-elf.tar.gz",
"archiveFileName": "linux32-xtensa-lx106-elf.tar.gz",
"checksum": "SHA-256:b24817819f0078fb05895a640e806e0aca9aa96b47b80d2390ac8e2d9ddc955a",
"size": "32734156"
},
{
"host": "arm-linux-gnueabihf",
"url": "https://github.com/esp8266/Arduino/releases/download/2.3.0/linuxarm-xtensa-lx106-elf-g46f160f-2.tar.gz",
"archiveFileName": "linuxarm-xtensa-lx106-elf-g46f160f-2.tar.gz",
"checksum": "SHA-256:f693946288f2ffa17288ef75ae16fa08573993f2b0a2a5e6bc35a68dc6087443",
"size": "34938475"
}
]
},
{
"name": "mkspiffs",
"version": "0.2.0",
"systems": [
{
"host": "i686-mingw32",
"url": "https://github.com/igrr/mkspiffs/releases/download/0.2.0/mkspiffs-0.2.0-no_magic_length-windows.zip",
"archiveFileName": "mkspiffs-0.2.0-no_magic_length-windows.zip",
"checksum": "SHA-256:4fbe17d2be4229c0eebb3939d14e9d96e74ba17724ab34276eb6d019006ce900",
"size": "347038"
},
{
"host": "x86_64-apple-darwin",
"url": "https://github.com/igrr/mkspiffs/releases/download/0.2.0/mkspiffs-0.2.0-no_magic_length-osx.tar.gz",
"archiveFileName": "mkspiffs-0.2.0-no_magic_length-osx.tar.gz",
"checksum": "SHA-256:e784d0b60c8b0ddc28e6467f5bffb7ae50db0a52c46b9ca18e71de0bf7f40a4d",
"size": "119145"
},
{
"host": "i386-apple-darwin",
"url": "https://github.com/igrr/mkspiffs/releases/download/0.2.0/mkspiffs-0.2.0-no_magic_length-osx.tar.gz",
"archiveFileName": "mkspiffs-0.2.0-no_magic_length-osx.tar.gz",
"checksum": "SHA-256:e784d0b60c8b0ddc28e6467f5bffb7ae50db0a52c46b9ca18e71de0bf7f40a4d",
"size": "119145"
},
{
"host": "x86_64-pc-linux-gnu",
"url": "https://github.com/igrr/mkspiffs/releases/download/0.2.0/mkspiffs-0.2.0-no_magic_length-linux64.tar.gz",
"archiveFileName": "mkspiffs-0.2.0-no_magic_length-linux64.tar.gz",
"checksum": "SHA-256:b63a99b844c3debeffe605ff2632d8b8a5c365431ee5a091fa0e6e3e1be1bc6c",
"size": "48995"
},
{
"host": "i686-pc-linux-gnu",
"url": "https://github.com/igrr/mkspiffs/releases/download/0.2.0/mkspiffs-0.2.0-no_magic_length-linux32.tar.gz",
"archiveFileName": "mkspiffs-0.2.0-no_magic_length-linux32.tar.gz",
"checksum": "SHA-256:dfed9bc40a88a2c89b78acc83181aff401abf1620b8041b136aa2ad6cd08779d",
"size": "47659"
},
{
"host": "arm-linux-gnueabihf",
"url": "https://github.com/igrr/mkspiffs/releases/download/0.2.0/mkspiffs-0.2.0-no_magic_length-linux-armhf.tar.gz",
"archiveFileName": "mkspiffs-0.2.0-no_magic_length-linux-armhf.tar.gz",
"checksum": "SHA-256:42367eb960ac8e3af32a2b4c5dd93dcff94464964e30f483d58e8cb96a895eb5",
"size": "43609"
}
]
}
]
}
]
}
4 changes: 3 additions & 1 deletion tools/boards.txt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1239,7 +1239,9 @@ def all_flash_map ():
f1m.update( flash_map( 1024, 512 ))

f2m.update( flash_map( 2*1024))
f2m.update( flash_map( 2*1024, 512 ))
f2m.update( flash_map( 2*1024, 128 ))
f2m.update( flash_map( 2*1024, 256 ))
f2m.update( flash_map( 2*1024, 512 ))
f2m.update( flash_map( 2*1024, 1024 ))

f4m.update( flash_map( 4*1024))
Expand Down
22 changes: 22 additions & 0 deletions tools/sdk/ld/eagle.flash.1.0m.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/* Flash Split for 1.0M chips */
/* sketch @0x40200000 (~999KB) (1023984B) */
/* empty @0x402F9FF0 (~4KB) (4112B) */
/* spiffs @0x402FB000 (~0KB) (0B) */
/* eeprom @0x402FB000 (4KB) */
/* rfcal @0x402FC000 (4KB) */
/* wifi @0x402FD000 (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 = 0xf9ff0
}

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

INCLUDE "local.eagle.app.v6.common.ld"
22 changes: 22 additions & 0 deletions tools/sdk/ld/eagle.flash.1.0m128.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/* Flash Split for 1.0M chips */
/* sketch @0x40200000 (~871KB) (892912B) */
/* empty @0x402D9FF0 (~4KB) (4112B) */
/* spiffs @0x402DB000 (~128KB) (131072B) */
/* eeprom @0x402FB000 (4KB) */
/* rfcal @0x402FC000 (4KB) */
/* wifi @0x402FD000 (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 = 0xd9ff0
}

PROVIDE ( _SPIFFS_start = 0x402DB000 );
PROVIDE ( _SPIFFS_end = 0x402FB000 );
PROVIDE ( _SPIFFS_page = 0x100 );
PROVIDE ( _SPIFFS_block = 0x1000 );

INCLUDE "local.eagle.app.v6.common.ld"
22 changes: 22 additions & 0 deletions tools/sdk/ld/eagle.flash.1.0m144.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/* Flash Split for 1.0M chips */
/* sketch @0x40200000 (~855KB) (876528B) */
/* empty @0x402D5FF0 (~4KB) (4112B) */
/* spiffs @0x402D7000 (~144KB) (147456B) */
/* eeprom @0x402FB000 (4KB) */
/* rfcal @0x402FC000 (4KB) */
/* wifi @0x402FD000 (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 = 0xd5ff0
}

PROVIDE ( _SPIFFS_start = 0x402D7000 );
PROVIDE ( _SPIFFS_end = 0x402FB000 );
PROVIDE ( _SPIFFS_page = 0x100 );
PROVIDE ( _SPIFFS_block = 0x1000 );

INCLUDE "local.eagle.app.v6.common.ld"
22 changes: 22 additions & 0 deletions tools/sdk/ld/eagle.flash.1.0m160.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/* Flash Split for 1.0M chips */
/* sketch @0x40200000 (~839KB) (860144B) */
/* empty @0x402D1FF0 (~4KB) (4112B) */
/* spiffs @0x402D3000 (~160KB) (163840B) */
/* eeprom @0x402FB000 (4KB) */
/* rfcal @0x402FC000 (4KB) */
/* wifi @0x402FD000 (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 = 0xd1ff0
}

PROVIDE ( _SPIFFS_start = 0x402D3000 );
PROVIDE ( _SPIFFS_end = 0x402FB000 );
PROVIDE ( _SPIFFS_page = 0x100 );
PROVIDE ( _SPIFFS_block = 0x1000 );

INCLUDE "local.eagle.app.v6.common.ld"
Loading