Merge branch 'release/v4.13.1'

builder/main.py

@@ -24,21 +24,17 @@
 platform = env.PioPlatform()
 board_config = env.BoardConfig()
 
+# Allow user to override via pre:script
+if env.get("PROGNAME", "program") == "program":
+    env.Replace(PROGNAME="firmware")
+
 env.Replace(
     ARFLAGS=["rc"],
-
-    SIZEPROGREGEXP=r"^(?:\.text|\.data|\.rodata|\.text.align|\.ARM.exidx)\s+(\d+).*",
-    SIZEDATAREGEXP=r"^(?:\.data|\.bss|\.noinit)\s+(\d+).*",
-    SIZECHECKCMD="$SIZETOOL -A -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 and board_config.get("build.core") == "teensy":
+build_core = board_config.get("build.core", "")
+if "BOARD" in env and build_core == "teensy":
     env.Replace(
         AR="avr-ar",
         AS="avr-as",
@@ -48,7 +44,7 @@
         OBJCOPY="avr-objcopy",
         RANLIB="avr-ranlib",
         SIZETOOL="avr-size",
-        SIZEPRINTCMD='$SIZETOOL --mcu=$BOARD_MCU -C -d $SOURCES'
+        SIZEPRINTCMD="$SIZETOOL --mcu=$BOARD_MCU -C -d $SOURCES"
     )
 
     env.Append(
@@ -88,7 +84,7 @@
     if not env.get("PIOFRAMEWORK"):
         env.SConscript("frameworks/_bare_avr.py")
 
-elif "BOARD" in env and board_config.get("build.core") in ("teensy3", "teensy4"):
+elif "BOARD" in env and build_core in ("teensy3", "teensy4"):
     env.Replace(
         AR="arm-none-eabi-ar",
         AS="arm-none-eabi-as",
@@ -98,7 +94,7 @@
         OBJCOPY="arm-none-eabi-objcopy",
         RANLIB="arm-none-eabi-gcc-ranlib",
         SIZETOOL="arm-none-eabi-size",
-        SIZEPRINTCMD='$SIZETOOL -B -d $SOURCES'
+        SIZEPRINTCMD="$SIZETOOL -B -d $SOURCES"
     )
 
     env.Append(
@@ -132,6 +128,21 @@
     if not env.get("PIOFRAMEWORK"):
         env.SConscript("frameworks/_bare_arm.py")
 
+# Default GCC's size tool
+env.Replace(
+    SIZECHECKCMD="$SIZETOOL -A -d $SOURCES",
+    SIZEPROGREGEXP=r"^(?:\.text|\.text\.progmem|\.text\.itcm|\.data|\.text\.csf)\s+([0-9]+).*",
+    SIZEDATAREGEXP=r"^(?:\.usbdescriptortable|\.dmabuffers|\.usbbuffers|\.data|\.bss|\.noinit|\.text\.itcm|\.text\.itcm\.padding)\s+([0-9]+).*",
+)
+
+# Disable memory calculation and print output from custom "teensy_size" tool
+if "arduino" in env.subst("$PIOFRAMEWORK") and build_core == "teensy4":
+    env.Replace(
+        SIZETOOL=None,
+        SIZECHECKCMD=None,
+        SIZEPRINTCMD="teensy_size $SOURCES",
+    )
+
 #
 # Target: Build executable and linkable firmware
 #

platform.json

@@ -19,7 +19,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-teensy.git"
   },
-  "version": "4.13.0",
+  "version": "4.13.1",
   "frameworks": {
     "arduino": {
       "package": "framework-arduinoteensy",

platform.py

@@ -29,9 +29,12 @@ def configure_default_packages(self, variables, targets):
             if del_toolchain in self.packages:
                 del self.packages[del_toolchain]
 
-        if "mbed" in variables.get("pioframework", []):
+        frameworks = variables.get("pioframework", [])
+        if "mbed" in frameworks:
             self.packages["toolchain-gccarmnoneeabi"][
                 "version"] = ">=1.60301.0,<1.80000.0"
+        elif "arduino" in frameworks and board_config.get("build.core", "") == "teensy4":
+            self.packages["tool-teensy"]["optional"] = False
 
         # configure J-LINK tool
         jlink_conds = [