From f7023aa8fff2d97d2ba1e181c8f3665a2463d2e2 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Wed, 7 Feb 2018 19:44:02 +0200
Subject: [PATCH] Print platform information while processing environment

---
 docs                                    |  2 +-
 platformio/builder/tools/pioplatform.py | 23 ++++++++++++++---------
 platformio/builder/tools/platformio.py  |  2 +-
 platformio/util.py                      |  4 ++--
 scripts/docspregen.py                   |  2 +-
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/docs b/docs
index 05232239..b32cd4a5 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 05232239555835cb4c5a82a943df740daf3382cc
+Subproject commit b32cd4a5f86d783276fc272f17fcd70d196ad9fa
diff --git a/platformio/builder/tools/pioplatform.py b/platformio/builder/tools/pioplatform.py
index a0e19af0..cebdc116 100644
--- a/platformio/builder/tools/pioplatform.py
+++ b/platformio/builder/tools/pioplatform.py
@@ -98,29 +98,34 @@ def LoadPioPlatform(env, variables):
         env.Replace(LDSCRIPT_PATH=board_config.get("build.ldscript"))
 
 
-def PrintSystemInfo(env):
-    data = []
-    debug_tools = None
+def PrintConfiguration(env):  # pylint: disable=too-many-branches
+    platform_data = ["Platform: %s ::" % env.PioPlatform().title]
+    system_data = ["System:"]
     mcu = env.subst("$BOARD_MCU")
     f_cpu = env.subst("$BOARD_F_CPU")
     if mcu:
-        data.append(mcu.upper())
+        system_data.append(mcu.upper())
     if f_cpu:
         f_cpu = int("".join([c for c in str(f_cpu) if c.isdigit()]))
-        data.append("%dMHz" % (f_cpu / 1000000))
+        system_data.append("%dMHz" % (f_cpu / 1000000))
 
+    debug_tools = None
     if "BOARD" in env:
         board_config = env.BoardConfig()
+        platform_data.append(board_config.get("name"))
+
         debug_tools = board_config.get("debug", {}).get("tools")
         ram = board_config.get("upload", {}).get("maximum_ram_size")
         flash = board_config.get("upload", {}).get("maximum_size")
         for (key, value) in (("RAM", ram), ("Flash", flash)):
             if not value:
                 continue
-            data.append("%s/%s" % (key, util.format_filesize(value)))
+            system_data.append("%s/%s" % (key, util.format_filesize(value)))
 
-    if data:
-        print "System: %s" % " ".join(data)
+    if platform_data:
+        print " ".join(platform_data)
+    if system_data:
+        print " ".join(system_data)
 
     # Debugging
     if not debug_tools:
@@ -151,5 +156,5 @@ def generate(env):
     env.AddMethod(BoardConfig)
     env.AddMethod(GetFrameworkScript)
     env.AddMethod(LoadPioPlatform)
-    env.AddMethod(PrintSystemInfo)
+    env.AddMethod(PrintConfiguration)
     return env
diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py
index 0e96cbc4..61f91981 100644
--- a/platformio/builder/tools/platformio.py
+++ b/platformio/builder/tools/platformio.py
@@ -42,7 +42,7 @@ def BuildProgram(env):
 
     _append_pio_macros()
 
-    env.PrintSystemInfo()
+    env.PrintConfiguration()
 
     # fix ASM handling under non case-sensitive OS
     if not case_sensitive_suffixes(".s", ".S"):
diff --git a/platformio/util.py b/platformio/util.py
index 526d69e7..c569f04a 100644
--- a/platformio/util.py
+++ b/platformio/util.py
@@ -755,9 +755,9 @@ def format_filesize(filesize):
         if filesize >= unit:
             continue
         if filesize % (base**(i + 1)):
-            return "%.2f%s" % ((base * filesize / unit), suffix)
+            return "%.2f%sB" % ((base * filesize / unit), suffix)
         break
-    return "%d%s" % ((base * filesize / unit), suffix)
+    return "%d%sB" % ((base * filesize / unit), suffix)
 
 
 def rmtree_(path):
diff --git a/scripts/docspregen.py b/scripts/docspregen.py
index fa188649..4384eee6 100644
--- a/scripts/docspregen.py
+++ b/scripts/docspregen.py
@@ -55,7 +55,7 @@ def generate_boards(boards, extend_debug=False, skip_columns=None):
         ("Platform", ":ref:`{platform_title} <platform_{platform}>`"),
         ("Debug", "{debug}"),
         ("MCU", "{mcu}"),
-        ("Frequency", "{f_cpu:d} MHz"),
+        ("Frequency", "{f_cpu:d}MHz"),
         ("Flash", "{rom}"),
         ("RAM", "{ram}"),
     ]