Skip to content

Commit 498c52d

Browse files
committed
Hot fix for "uploadfs" target while PlatformIO 3.2 isn't released // Resolve platformio#9
1 parent 03c47be commit 498c52d

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

builder/main.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,10 @@ def _fetch_spiffs_size(target, source, env):
323323
target_firm = join("$BUILD_DIR", "firmware.bin")
324324
else:
325325
if set(["buildfs", "uploadfs", "uploadfsota"]) & set(COMMAND_LINE_TARGETS):
326+
# append specified LD_SCRIPT
327+
if ("LDSCRIPT_PATH" in env and
328+
not any(["-Wl,-T" in f for f in env['LINKFLAGS']])):
329+
env.Append(LINKFLAGS=['-Wl,-T"$LDSCRIPT_PATH"'])
326330
target_firm = env.DataToBin(
327331
join("$BUILD_DIR", "spiffs"), "$PROJECTDATA_DIR")
328332
AlwaysBuild(target_firm)

platform.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"type": "git",
1414
"url": "https://github.com/platformio/platform-espressif8266.git"
1515
},
16-
"version": "1.1.0",
16+
"version": "1.1.1",
1717
"packageRepositories": [
1818
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
1919
"https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",

0 commit comments

Comments
 (0)