Merge branch 'develop' into feature/platform-stm32

platformio/builder/main.py

@@ -84,6 +84,15 @@ if "BOARD" in env:
         env.Replace(UPLOAD_PROTOCOL="${BOARD_OPTIONS['upload']['protocol']}")
     if "UPLOAD_SPEED" not in env:
         env.Replace(UPLOAD_SPEED="${BOARD_OPTIONS['upload']['speed']}")
+    # specific linker script
+    if "ldscript" in env.get("BOARD_OPTIONS", {}).get("build", {}):
+        env.Replace(
+            LINKFLAGS=["-T", join(
+                "$PIOHOME_DIR", "packages", "ldscripts",
+                "${BOARD_OPTIONS['build']['ldscript']}")]
+        )
+    if "extra_flags" in env.get("BOARD_OPTIONS", {}).get("build", {}):
+        env.MergeFlags(env.subst("${BOARD_OPTIONS['build']['extra_flags']}"))        
 
 env.PrependENVPath(
     "PATH",

platformio/builder/scripts/frameworks/energia.py

@@ -33,16 +33,6 @@ env.Append(
     ]
 )
 
-# specific linker script for TIVA devices
-if "ldscript" in env.subst("${BOARD_OPTIONS['build']}"):
-    env.Append(
-        LINKFLAGS=["-T", join(
-            "$PLATFORMFW_DIR", "cores",
-            "${BOARD_OPTIONS['build']['core']}",
-            "${BOARD_OPTIONS['build']['ldscript']}")]
-    )
-
-
 #
 # Target: Build Core Library
 #

platformio/builder/scripts/titiva.py

@@ -58,6 +58,11 @@ env.Replace(
         "F_CPU=$BOARD_F_CPU"
     ],
 
+    UPLOADER=join("$PIOPACKAGES_DIR", "tool-lm4flash", "lm4flash"),
+    UPLOADCMD="$UPLOADER $SOURCES"
+)
+
+env.Append(
     LINKFLAGS=[
         "-Os",
         "-nostartfiles",
@@ -69,10 +74,7 @@ env.Replace(
         "-mfloat-abi=hard",
         "-mfpu=fpv4-sp-d16",
         "-fsingle-precision-constant"
-    ],
+    ]
-
-    UPLOADER=join("$PIOPACKAGES_DIR", "tool-lm4flash", "lm4flash"),
-    UPLOADCMD="$UPLOADER $SOURCES"
 )
 
 env.Append(