Merge branch 'release/v4.7.1'

platformio · Feb 12, 2020 · 94733f0 · 94733f0
2 parents 4d1de88 + e9ec36b
commit 94733f0
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 9 deletions.
diff --git a/boards/teensy2.json b/boards/teensy2.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "teensy",
-    "extra_flags": "-DARDUINO_ARCH_AVR -TEENSY2",
+    "extra_flags": "-DARDUINO_ARCH_AVR -DTEENSY2",
     "f_cpu": "16000000L",
     "mcu": "atmega32u4"
   },

diff --git a/boards/teensy30.json b/boards/teensy30.json
@@ -1,10 +1,12 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "mk20dx128.ld"
+    },
     "core": "teensy3",
     "cpu": "cortex-m4",
     "extra_flags": "-D__MK20DX128__ -DTEENSY30",
     "f_cpu": "48000000L",
-    "ldscript": "mk20dx128.ld",
     "mcu": "mk20dx128"
   },
   "frameworks": [

diff --git a/boards/teensy31.json b/boards/teensy31.json
@@ -1,10 +1,12 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "mk20dx256.ld"
+    },
     "core": "teensy3",
     "cpu": "cortex-m4",
     "extra_flags": "-D__MK20DX256__ -DTEENSY31",
     "f_cpu": "72000000L",
-    "ldscript": "mk20dx256.ld",
     "mcu": "mk20dx256"
   },
   "debug": {

diff --git a/boards/teensy35.json b/boards/teensy35.json
@@ -1,10 +1,12 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "mk64fx512.ld"
+    },
     "core": "teensy3",
     "cpu": "cortex-m4",
     "extra_flags": "-D__MK64FX512__ -DTEENSY35",
     "f_cpu": "120000000L",
-    "ldscript": "mk64fx512.ld",
     "mcu": "mk64fx512"
   },
   "connectivity": [

diff --git a/boards/teensy36.json b/boards/teensy36.json
@@ -1,10 +1,12 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "mk66fx1m0.ld"
+    },
     "core": "teensy3",
     "cpu": "cortex-m4",
     "extra_flags": "-D__MK66FX1M0__ -DTEENSY36",
     "f_cpu": "180000000L",
-    "ldscript": "mk66fx1m0.ld",
     "mcu": "mk66fx1m0"
   },
   "connectivity": [

diff --git a/boards/teensy40.json b/boards/teensy40.json
@@ -1,10 +1,12 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "imxrt1062.ld"
+    },
     "core": "teensy4",
     "cpu": "cortex-m7",
     "extra_flags": "-D__IMXRT1062__ -DTEENSY40",
     "f_cpu": "600000000",
-    "ldscript": "imxrt1062.ld",
     "mcu": "imxrt1062"
   },
   "connectivity": [

diff --git a/boards/teensylc.json b/boards/teensylc.json
@@ -1,10 +1,12 @@
 {
   "build": {
+    "arduino": {
+      "ldscript": "mkl26z64.ld"
+    },
     "core": "teensy3",
     "cpu": "cortex-m0plus",
     "extra_flags": "-D__MKL26Z64__ -DTEENSYLC",
     "f_cpu": "48000000L",
-    "ldscript": "mkl26z64.ld",
     "mcu": "mkl26z64"
   },
   "debug": {

diff --git a/builder/frameworks/arduino.py b/builder/frameworks/arduino.py
@@ -162,6 +162,9 @@
         LIBS=["m", "stdc++"]
     )
 
+    if not env.BoardConfig().get("build.ldscript", ""):
+        env.Replace(LDSCRIPT_PATH=env.BoardConfig().get("build.arduino.ldscript", ""))
+
     if env.BoardConfig().id_ in ("teensy35", "teensy36", "teensy40"):
         fpv_version = "4-sp"
         if env.BoardConfig().id_ == "teensy40":

diff --git a/platform.json b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-teensy.git"
   },
-  "version": "4.7.0",
+  "version": "4.7.1",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json"
@@ -46,7 +46,7 @@
     "framework-mbed": {
       "type": "framework",
       "optional": true,
-      "version": "~5.51401.0"
+      "version": "~6.51401.0"
     },
     "tool-teensy": {
       "type": "uploader",