diff --git a/builder/main.py b/builder/main.py
index a3c3ac2..e06c5cd 100644
--- a/builder/main.py
+++ b/builder/main.py
@@ -36,6 +36,22 @@
 
     ARFLAGS=["rc"],
 
+    UPLOADER="lm4flash",
+    UPLOADCMD='$UPLOADER $SOURCES',
+
+    SIZEPROGREGEXP=r"^(?:\.text|\.data|\.rodata|\.text.align|\.ARM.exidx)\s+(\d+).*",
+    SIZEDATAREGEXP=r"^(?:\.data|\.bss|\.noinit)\s+(\d+).*",
+    SIZECHECKCMD="$SIZETOOL -A -d $SOURCES",
+    SIZEPRINTCMD='$SIZETOOL -B -d $SOURCES',
+
+    PROGSUFFIX=".elf"
+)
+
+# Allow user to override via pre:script
+if env.get("PROGNAME", "program") == "program":
+    env.Replace(PROGNAME="firmware")
+
+env.Append(
     ASFLAGS=["-x", "assembler-with-cpp"],
 
     CCFLAGS=[
@@ -71,31 +87,6 @@
 
     LIBS=["c", "gcc", "m"],
 
-    UPLOADER="lm4flash",
-    UPLOADCMD='$UPLOADER $SOURCES',
-
-    SIZEPRINTCMD='$SIZETOOL -B -d $SOURCES',
-
-    PROGSUFFIX=".elf"
-)
-
-# Allow user to override via pre:script
-if env.get("PROGNAME", "program") == "program":
-    env.Replace(PROGNAME="firmware")
-
-if "BOARD" in env:
-    env.Append(
-        CCFLAGS=[
-            "-mcpu=%s" % env.BoardConfig().get("build.cpu")
-        ],
-        LINKFLAGS=[
-            "-mcpu=%s" % env.BoardConfig().get("build.cpu")
-        ]
-    )
-
-env.Append(
-    ASFLAGS=env.get("CCFLAGS", [])[:],
-
     BUILDERS=dict(
         ElfToBin=Builder(
             action=env.VerboseAction(" ".join([
@@ -122,6 +113,18 @@
     )
 )
 
+if "BOARD" in env:
+    env.Append(
+        CCFLAGS=[
+            "-mcpu=%s" % env.BoardConfig().get("build.cpu")
+        ],
+        LINKFLAGS=[
+            "-mcpu=%s" % env.BoardConfig().get("build.cpu")
+        ]
+    )
+
+# copy CCFLAGS to ASFLAGS (-x assembler-with-cpp mode)
+env.Append(ASFLAGS=env.get("CCFLAGS", [])[:])
 
 #
 # Target: Build executable and linkable firmware
diff --git a/examples/energia-internal-libs/platformio.ini b/examples/energia-internal-libs/platformio.ini
index 1b2b090..0c9393c 100644
--- a/examples/energia-internal-libs/platformio.ini
+++ b/examples/energia-internal-libs/platformio.ini
@@ -17,7 +17,7 @@ platform = titiva
 framework = energia
 board = lptm4c1230c3pm
 
-[env:lptm4c1294ncpdt]
+[env:lptm4c1294ncpdt board]
 platform = titiva
 framework = energia
 board = lptm4c1294ncpdt
diff --git a/examples/libopencm3-blink/platformio.ini b/examples/libopencm3-blink/platformio.ini
index 9d85bdf..e718f33 100644
--- a/examples/libopencm3-blink/platformio.ini
+++ b/examples/libopencm3-blink/platformio.ini
@@ -17,7 +17,7 @@ platform = titiva
 framework = libopencm3
 board = lptm4c1230c3pm
 
-[env:lptm4c1294ncpdt]
+[env:lptm4c1294ncpdt board]
 platform = titiva
 framework = libopencm3
 board = lptm4c1294ncpdt
diff --git a/platform.json b/platform.json
index 7b16e14..bb9f0ae 100644
--- a/platform.json
+++ b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-titiva.git"
   },
-  "version": "2.0.4",
+  "version": "2.0.5",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json"