Skip to content

Commit e22720d

Browse files
committed
Use "eboot.elf" from Simba package
1 parent dc5172f commit e22720d

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ env:
99
- PLATFORMIO_PROJECT_DIR=examples/arduino-webserver
1010
- PLATFORMIO_PROJECT_DIR=examples/arduino-wifiscan
1111
- PLATFORMIO_PROJECT_DIR=examples/esp8266-rtos-sdk-blink
12-
- PLATFORMIO_PROJECT_DIR=examples/native-sdk
1312
- PLATFORMIO_PROJECT_DIR=examples/simba-blink
1413

1514
install:

appveyor.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ environment:
66
- PLATFORMIO_PROJECT_DIR: "examples/arduino-webserver"
77
- PLATFORMIO_PROJECT_DIR: "examples/arduino-wifiscan"
88
- PLATFORMIO_PROJECT_DIR: "examples/esp8266-rtos-sdk-blink"
9-
- PLATFORMIO_PROJECT_DIR: "examples/native-sdk"
109
- PLATFORMIO_PROJECT_DIR: "examples/simba-blink"
1110

1211
install:

builder/main.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,15 +202,21 @@ def _update_max_upload_size(env):
202202
#
203203

204204
if env.subst("$PIOFRAMEWORK") in ("arduino", "simba"):
205+
if "simba" in env.subst("$PIOFRAMEWORK"):
206+
ebootelf_path = join(
207+
platform.get_package_dir("framework-simba") or "", "3pp",
208+
"esp8266Arduino", "2.3.0", "bootloaders", "eboot", "eboot.elf")
209+
else:
210+
ebootelf_path = join(
211+
platform.get_package_dir("framework-arduinoespressif8266") or "",
212+
"bootloaders", "eboot", "eboot.elf")
213+
205214
env.Append(
206215
BUILDERS=dict(
207216
ElfToBin=Builder(
208217
action=env.VerboseAction(" ".join([
209218
'"$OBJCOPY"',
210-
"-eo", '"%s"' % join(
211-
platform.get_package_dir(
212-
"framework-arduinoespressif8266"),
213-
"bootloaders", "eboot", "eboot.elf"),
219+
"-eo", '"%s"' % ebootelf_path,
214220
"-bo", "$TARGET",
215221
"-bm", "$BOARD_FLASH_MODE",
216222
"-bf", "${__get_board_f_flash(__env__)}",

0 commit comments

Comments
 (0)