From df18ae084b884ecd1fcc738b46a8dfd70ab7e695 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Sat, 2 Jun 2018 15:59:00 +0300
Subject: [PATCH 1/4] Declare command for checking memory usage

---
 builder/main.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/builder/main.py b/builder/main.py
index a3c3ac2..51205f2 100644
--- a/builder/main.py
+++ b/builder/main.py
@@ -74,6 +74,9 @@
     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"

From c2e14d10a28630c666064fb6fc93ce32d74e4a04 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Fri, 8 Jun 2018 19:55:02 +0300
Subject: [PATCH 2/4] Test project with space

---
 examples/energia-internal-libs/platformio.ini | 2 +-
 examples/libopencm3-blink/platformio.ini      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

From d8bcc16797c9bdcbf6f90f859ec68d6ca7561c27 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Sat, 11 Aug 2018 21:22:36 +0300
Subject: [PATCH 3/4] Append flags instead of replacing

---
 builder/main.py | 56 ++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/builder/main.py b/builder/main.py
index 51205f2..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,34 +87,6 @@
 
     LIBS=["c", "gcc", "m"],
 
-    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")
-
-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([
@@ -125,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

From 4e438a32dc2c9992b4192f3a40d4e373a36e03d7 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Sat, 11 Aug 2018 21:23:09 +0300
Subject: [PATCH 4/4] Bump version to 2.0.5

---
 platform.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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"