From c452302735e7f00aa68ef58c37987d38d4359583 Mon Sep 17 00:00:00 2001
From: Valeriy Koval <valeros@bigmir.net>
Date: Tue, 20 Jan 2015 17:41:49 +0200
Subject: [PATCH] Move "ldscript" to own package

---
 platformio/builder/main.py                       |  7 +++++++
 platformio/builder/scripts/frameworks/energia.py | 10 ----------
 platformio/builder/scripts/titiva.py             | 10 ++++++----
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/platformio/builder/main.py b/platformio/builder/main.py
index a69a31d0..aae1e50e 100644
--- a/platformio/builder/main.py
+++ b/platformio/builder/main.py
@@ -84,6 +84,13 @@ 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']}")]
+        )
 
 env.PrependENVPath(
     "PATH",
diff --git a/platformio/builder/scripts/frameworks/energia.py b/platformio/builder/scripts/frameworks/energia.py
index 45db6e7d..8c479287 100644
--- a/platformio/builder/scripts/frameworks/energia.py
+++ b/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
 #
diff --git a/platformio/builder/scripts/titiva.py b/platformio/builder/scripts/titiva.py
index 046d11b0..a9219921 100644
--- a/platformio/builder/scripts/titiva.py
+++ b/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(