Merge branch 'release/v2.1.1'

platformio · Feb 12, 2020 · 5003ddb · 5003ddb
2 parents 6cbf9c8 + ad725e4
commit 5003ddb
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 6 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -9,7 +9,7 @@ environment:
 
 install:
   - cmd: git submodule update --init --recursive
-  - cmd: SET PATH=%PATH%;C:\Python36\Scripts
+  - cmd: SET PATH=C:\Python36\Scripts;%PATH%
   - cmd: pip3 install -U https://github.com/platformio/platformio/archive/develop.zip
   - cmd: platformio platform install file://.
 

diff --git a/boards/lplm4f120h5qr.json b/boards/lplm4f120h5qr.json
@@ -1,10 +1,12 @@
 {
   "build": {
+    "arduino":{
+      "ldscript": "lm4fcpp_blizzard.ld"
+    },
     "core": "tivac",
     "cpu": "cortex-m4",
     "extra_flags": "-DENERGIA_ARCH_TIVAC -DENERGIA_EK_TM4C123GXL",
     "f_cpu": "80000000L",
-    "ldscript": "lm4fcpp_blizzard.ld",
     "mcu": "lplm4f120h5qr",
     "variant": "EK-TM4C123GXL"
   },

diff --git a/boards/lptm4c1230c3pm.json b/boards/lptm4c1230c3pm.json
@@ -1,10 +1,12 @@
 {
   "build": {
+    "arduino":{
+      "ldscript": "lm4fcpp_blizzard.ld"
+    },
     "core": "tivac",
     "cpu": "cortex-m4",
     "extra_flags": "-DENERGIA_ARCH_TIVAC -DENERGIA_EK_TM4C123GXL",
     "f_cpu": "80000000L",
-    "ldscript": "lm4fcpp_blizzard.ld",
     "mcu": "lptm4c1230c3pm",
     "variant": "EK-TM4C123GXL"
   },

diff --git a/boards/lptm4c1294ncpdt.json b/boards/lptm4c1294ncpdt.json
@@ -1,10 +1,12 @@
 {
   "build": {
+    "arduino":{
+      "ldscript": "lm4fcpp_snowflake.ld"
+    },
     "core": "tivac",
     "cpu": "cortex-m4",
     "extra_flags": "-DENERGIA_ARCH_TIVAC -DENERGIA_EK_TM4C1294XL",
     "f_cpu": "120000000L",
-    "ldscript": "lm4fcpp_snowflake.ld",
     "mcu": "lptm4c1294ncpdt",
     "variant": "EK-TM4C1294XL"
   },

diff --git a/builder/frameworks/energia.py b/builder/frameworks/energia.py
@@ -85,6 +85,8 @@
     ]
 )
 
+if not env.BoardConfig().get("build.ldscript", ""):
+    env.Replace(LDSCRIPT_PATH=env.BoardConfig().get("build.arduino.ldscript", ""))
 
 #
 # Target: Build Core Library

diff --git a/builder/frameworks/libopencm3 b/builder/frameworks/libopencm3
diff --git a/platform.json b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-titiva.git"
   },
-  "version": "2.1.0",
+  "version": "2.1.1",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json"
-Original file line number
+Diff line change
@@ Expand Up / @@ -85,6 +85,8 @@ @@
         ]
     )
+    if not env.BoardConfig().get("build.ldscript", ""):
+        env.Replace(LDSCRIPT_PATH=env.BoardConfig().get("build.arduino.ldscript", ""))
     #
     # Target: Build Core Library
@@ Expand Down @@