Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Update boards.txt.py and platform.io build
  • Loading branch information
earlephilhower committed Sep 19, 2018
commit 8024cc0c2fdd7a5788779f71c720aebddf0428ac
2 changes: 1 addition & 1 deletion tools/boards.txt.py
Original file line number Diff line number Diff line change
Expand Up @@ -1172,7 +1172,7 @@ def flash_map (flashsize_kb, spiffs_kb = 0):
print("PROVIDE ( _SPIFFS_page = 0x%X );" % page)
print("PROVIDE ( _SPIFFS_block = 0x%X );" % block)
print("")
print('INCLUDE "eagle.app.v6.common.ld"')
print('INCLUDE "local.eagle.app.v6.common.ld"')

if ldgen:
sys.stdout.close()
Expand Down
2 changes: 1 addition & 1 deletion tools/platformio-build.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def scons_patched_match_splitext(path, suffixes=None):

# Build the eagle.app.v6.common.ld linker file
app_ld = env.Command(
join("$BUILD_DIR", "ld", "eagle.app.v6.common.ld"),
join("$BUILD_DIR", "ld", "local.eagle.app.v6.common.ld"),
join(FRAMEWORK_DIR, "tools", "sdk", "ld", "eagle.app.v6.common.ld.h"),
env.VerboseAction(
"$CC -CC -E -P -D%s $SOURCE -o $TARGET" % current_vtables,
Expand Down