platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-31 18:44:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/ivankravets/platformio into develop

Browse Source 
* 'develop' of https://github.com/ivankravets/platformio:
  Allow using custom linker script for the libopenCM3 framework.
This commit is contained in:
Ivan Kravets
2016-01-26 20:31:30 +02:00
parent ec19341e05 477f387bd7
commit 503decdf2e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platformio/builder/scripts/frameworks/libopencm3.py
View File

@@ -56,7 +56,6 @@ def find_ldscript(src_dir):
elif isfile(join(src_dir, BOARD_BUILDOPTS['ldscript'])): elif isfile(join(src_dir, BOARD_BUILDOPTS['ldscript'])):
ldscript = join(src_dir, BOARD_BUILDOPTS['ldscript']) ldscript = join(src_dir, BOARD_BUILDOPTS['ldscript'])
assert isfile(ldscript)
return ldscript return ldscript
@@ -169,7 +168,8 @@ if BOARD_BUILDOPTS.get("core") == "stm32":
root_dir = join(root_dir, BOARD_BUILDOPTS.get("variant")[5:7]) root_dir = join(root_dir, BOARD_BUILDOPTS.get("variant")[5:7])
ldscript_path = find_ldscript(root_dir) ldscript_path = find_ldscript(root_dir)
merge_ld_scripts(ldscript_path) if ldscript_path:
merge_ld_scripts(ldscript_path)
generate_nvic_files() generate_nvic_files()
# override ldscript by libopencm3 # override ldscript by libopencm3