Skip to content

Commit

Permalink
scripts: some more Core version fixes
Browse files Browse the repository at this point in the history
Remove 2.3.0 code for ldscripts
Update
  • Loading branch information
mcspr committed Jun 18, 2021
1 parent 939f4af commit a1e7941
Show file tree
Hide file tree
Showing 19 changed files with 17 additions and 447 deletions.
8 changes: 4 additions & 4 deletions code/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,19 @@ platform_latest = espressif8266@2.6.3

# 487 KB sketch, 4 KB eeprom, 16 KB reserved, no space for ota
board_512k = esp01
ldscript_512k = eagle.flash.512k0m1s.ld
ldscript_512k = eagle.flash.512k.ld

# 999 KB sketch, 4 KB eeprom, 16 KB reserved
board_1m = esp01_1m
ldscript_1m = eagle.flash.1m0m1s.ld
ldscript_1m = eagle.flash.1m.ld

# 1019 KB sketch, 16 KB eeprom, 992 KB fs, 16 KB reserved
board_2m = esp_wroom_02
ldscript_2m = eagle.flash.2m1m4s.ld
ldscript_2m = eagle.flash.2m1m.ld

# 1019 KB sketch, 16 KB eeprom, 992 KB fs, 16 KB reserved, 2048 KB empty/ota
board_4m = esp12e
ldscript_4m = eagle.flash.4m1m4s.ld
ldscript_4m = eagle.flash.4m1m.ld

# OPTIONAL:
# 1019 KB sketch, 16 KB eeprom, 3040 KB fs, 16 KB reserved
Expand Down
16 changes: 1 addition & 15 deletions code/scripts/espurna_utils/ldscripts.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,4 @@ def ldscripts_inject_libpath(env):
framework_dir = platform.get_package_dir("framework-arduinoespressif8266")

libpath_base = os.path.join("$PROJECT_DIR", "..", "dist", "ld")

# we depend on different ldscript formats for old Core version
# TODO: 1.5.0 needs to be removed next release
# TODO: ldscript can be kept in the root of the repo
# (as this was done originally, during 2.3.0...2.4.2 times)

if platform.version == "1.5.0":
libpath_sdk = os.path.join(framework_dir, "tools", "sdk", "ld")
env.Append(LIBPATH=[libpath_sdk])
env.Prepend(LIBPATH=[os.path.join(libpath_base, "pre_2.5.0")])
else:
local_ld = env.subst(
os.path.join("$BUILD_DIR", "ld", "local.eagle.app.v6.common.ld")
)
env.Prepend(LIBPATH=[os.path.join(libpath_base, "latest")])
env.Prepend(LIBPATH=[libpath_base])
39 changes: 0 additions & 39 deletions dist/arduino_ide/2.3.0/boards.local.txt

This file was deleted.

3 changes: 1 addition & 2 deletions dist/arduino_ide/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ Place boards.local.txt into Arduino hardware directory, in the same directory as
- macOS (boards manager): `~/Library/Arduino15/packages/esp2866/hardware/esp8266/<version>`
- macOS (git): `<application-directory>/Arduino.app/Contents/Java/hardware/esp8266com/esp8266`

Use `2.3.0/boards.local.txt` for Core version 2.3.0
Use `latest/boards.local.txt` for all the others
Use `latest/boards.local.txt` for Cores 2.7.4+


### Arduino documentation
Expand Down
11 changes: 7 additions & 4 deletions dist/ld/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
# ESP8266 linker scripts with additional EEPROM sectors
# ESP8266 linker scripts override

### Installation
### PlatformIO

Depending on ESP8266 version, use files from either `Pre 2.5.0` or `latest`
Reference [../arduino_ide/README.md](../arduino_ide/README.md) about ESP8266 package location
Detected automatically, no extra steps required.

### Arduino IDE

Reference [../arduino\_ide/README.md](../arduino_ide/README.md) about ESP8266 package location

Copy all \*.ld files into the `<esp8266-package>/tools/sdk/ld` directory
30 changes: 0 additions & 30 deletions dist/ld/latest/eagle.flash.1m0m1s.ld

This file was deleted.

30 changes: 0 additions & 30 deletions dist/ld/latest/eagle.flash.1m0m2s.ld

This file was deleted.

30 changes: 0 additions & 30 deletions dist/ld/latest/eagle.flash.2m1m4s.ld

This file was deleted.

30 changes: 0 additions & 30 deletions dist/ld/latest/eagle.flash.4m1m4s.ld

This file was deleted.

30 changes: 0 additions & 30 deletions dist/ld/latest/eagle.flash.4m3m4s.ld

This file was deleted.

30 changes: 0 additions & 30 deletions dist/ld/latest/eagle.flash.512k0m1s.ld

This file was deleted.

30 changes: 0 additions & 30 deletions dist/ld/pre_2.5.0/eagle.flash.1m0m1s.ld

This file was deleted.

30 changes: 0 additions & 30 deletions dist/ld/pre_2.5.0/eagle.flash.1m0m2s.ld

This file was deleted.

30 changes: 0 additions & 30 deletions dist/ld/pre_2.5.0/eagle.flash.2m1m4s.ld

This file was deleted.

Loading

0 comments on commit a1e7941

Please sign in to comment.