Skip to content

Commit a1e7941

Browse files
committed
scripts: some more Core version fixes
Remove 2.3.0 code for ldscripts Update
1 parent 939f4af commit a1e7941

19 files changed

+17
-447
lines changed

code/platformio.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,19 @@ platform_latest = [email protected]
5252

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

5757
# 999 KB sketch, 4 KB eeprom, 16 KB reserved
5858
board_1m = esp01_1m
59-
ldscript_1m = eagle.flash.1m0m1s.ld
59+
ldscript_1m = eagle.flash.1m.ld
6060

6161
# 1019 KB sketch, 16 KB eeprom, 992 KB fs, 16 KB reserved
6262
board_2m = esp_wroom_02
63-
ldscript_2m = eagle.flash.2m1m4s.ld
63+
ldscript_2m = eagle.flash.2m1m.ld
6464

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

6969
# OPTIONAL:
7070
# 1019 KB sketch, 16 KB eeprom, 3040 KB fs, 16 KB reserved

code/scripts/espurna_utils/ldscripts.py

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,4 @@ def ldscripts_inject_libpath(env):
55
framework_dir = platform.get_package_dir("framework-arduinoespressif8266")
66

77
libpath_base = os.path.join("$PROJECT_DIR", "..", "dist", "ld")
8-
9-
# we depend on different ldscript formats for old Core version
10-
# TODO: 1.5.0 needs to be removed next release
11-
# TODO: ldscript can be kept in the root of the repo
12-
# (as this was done originally, during 2.3.0...2.4.2 times)
13-
14-
if platform.version == "1.5.0":
15-
libpath_sdk = os.path.join(framework_dir, "tools", "sdk", "ld")
16-
env.Append(LIBPATH=[libpath_sdk])
17-
env.Prepend(LIBPATH=[os.path.join(libpath_base, "pre_2.5.0")])
18-
else:
19-
local_ld = env.subst(
20-
os.path.join("$BUILD_DIR", "ld", "local.eagle.app.v6.common.ld")
21-
)
22-
env.Prepend(LIBPATH=[os.path.join(libpath_base, "latest")])
8+
env.Prepend(LIBPATH=[libpath_base])

dist/arduino_ide/2.3.0/boards.local.txt

Lines changed: 0 additions & 39 deletions
This file was deleted.

dist/arduino_ide/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ Place boards.local.txt into Arduino hardware directory, in the same directory as
1313
- macOS (boards manager): `~/Library/Arduino15/packages/esp2866/hardware/esp8266/<version>`
1414
- macOS (git): `<application-directory>/Arduino.app/Contents/Java/hardware/esp8266com/esp8266`
1515

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

1918

2019
### Arduino documentation

dist/ld/README.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
# ESP8266 linker scripts with additional EEPROM sectors
1+
# ESP8266 linker scripts override
22

3-
### Installation
3+
### PlatformIO
44

5-
Depending on ESP8266 version, use files from either `Pre 2.5.0` or `latest`
6-
Reference [../arduino_ide/README.md](../arduino_ide/README.md) about ESP8266 package location
5+
Detected automatically, no extra steps required.
6+
7+
### Arduino IDE
8+
9+
Reference [../arduino\_ide/README.md](../arduino_ide/README.md) about ESP8266 package location
710

811
Copy all \*.ld files into the `<esp8266-package>/tools/sdk/ld` directory

dist/ld/latest/eagle.flash.1m0m1s.ld

Lines changed: 0 additions & 30 deletions
This file was deleted.

dist/ld/latest/eagle.flash.1m0m2s.ld

Lines changed: 0 additions & 30 deletions
This file was deleted.

dist/ld/latest/eagle.flash.2m1m4s.ld

Lines changed: 0 additions & 30 deletions
This file was deleted.

dist/ld/latest/eagle.flash.4m1m4s.ld

Lines changed: 0 additions & 30 deletions
This file was deleted.

dist/ld/latest/eagle.flash.4m3m4s.ld

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)