diff --git a/appveyor.yml b/appveyor.yml index ad6b010..d5e7223 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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://. diff --git a/boards/artix7_100t.json b/boards/artix7_100t.json index df07699..fce599b 100644 --- a/boards/artix7_100t.json +++ b/boards/artix7_100t.json @@ -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": [ diff --git a/boards/artix7_35t.json b/boards/artix7_35t.json index 07ee476..ed233dc 100644 --- a/boards/artix7_35t.json +++ b/boards/artix7_35t.json @@ -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": [ diff --git a/builder/frameworks/shakti-sdk.py b/builder/frameworks/shakti-sdk.py index 8d847ce..4ad2450 100644 --- a/builder/frameworks/shakti-sdk.py +++ b/builder/frameworks/shakti-sdk.py @@ -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 # diff --git a/platform.json b/platform.json index 0cfba78..ac75b4e 100644 --- a/platform.json +++ b/platform.json @@ -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"