Skip to content

Commit

Permalink
Merge branch 'release/v1.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
ivankravets committed Feb 12, 2020
2 parents 1cde0c9 + 07df42e commit b459468
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 6 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ environment:

install:
- cmd: git submodule update --init --recursive
- cmd: SET PATH=%PATH%;C:\Python27\Scripts
- cmd: SET PATH=C:\Python36\Scripts;%PATH%
- cmd: pip install -U https://github.com/platformio/platformio/archive/develop.zip
- cmd: platformio platform install file://.

Expand Down
6 changes: 4 additions & 2 deletions boards/artix7_100t.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@
"0x15ba"
]
],
"ldscript": "link.ld",
"mabi": "lp64",
"march": "rv64imac",
"mcmodel": "medany",
"mcu": "C-Class"
"mcu": "C-Class",
"shakti-sdk":{
"ldscript": "link.ld"
}
},
"debug": {
"onboard_tools": [
Expand Down
6 changes: 4 additions & 2 deletions boards/artix7_35t.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@
"0x15ba"
]
],
"ldscript": "link.ld",
"mabi": "ilp32",
"march": "rv32imac",
"mcmodel": "medany",
"mcu": "E-Class"
"mcu": "E-Class",
"shakti-sdk":{
"ldscript": "link.ld"
}
},
"debug": {
"onboard_tools": [
Expand Down
3 changes: 3 additions & 0 deletions builder/frameworks/shakti-sdk.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ def is_valid_target(target):
print ("Could not find BSP package for %s" % target)
env.Exit(1)

if not env.BoardConfig().get("build.ldscript", ""):
env.Replace(LDSCRIPT_PATH=env.BoardConfig().get("build.shakti-sdk.ldscript", ""))

#
# Target: Build core BSP libraries
#
Expand Down
2 changes: 1 addition & 1 deletion platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"type": "git",
"url": "https://github.com/platformio/platform-shakti.git"
},
"version": "1.0.0",
"version": "1.0.1",
"packageRepositories": [
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
"http://dl.platformio.org/packages/manifest.json"
Expand Down

0 comments on commit b459468

Please sign in to comment.