diff --git a/platformio/builder/scripts/frameworks/energia.py b/platformio/builder/scripts/frameworks/energia.py
index 5ad12955..29a9576e 100644
--- a/platformio/builder/scripts/frameworks/energia.py
+++ b/platformio/builder/scripts/frameworks/energia.py
@@ -33,6 +33,11 @@ env.Append(
     ]
 )
 
+if env.get("BOARD_OPTIONS", {}).get("build", {}).get("core") == "lm4f":
+    env.Append(
+        LINKFLAGS=["-Wl,--entry=ResetISR"]
+    )
+
 #
 # Target: Build Core Library
 #
diff --git a/platformio/builder/scripts/titiva.py b/platformio/builder/scripts/titiva.py
index 12229da5..e5c39a88 100644
--- a/platformio/builder/scripts/titiva.py
+++ b/platformio/builder/scripts/titiva.py
@@ -69,7 +69,6 @@ env.Append(
         "-nostartfiles",
         "-nostdlib",
         "-Wl,--gc-sections",
-        "-Wl,--entry=ResetISR",
         "-mthumb",
         "-mcpu=cortex-m4",
         "-mfloat-abi=hard",