diff --git a/platformio/builder/scripts/basearm.py b/platformio/builder/scripts/basearm.py
index 65e08d89..d265ee1e 100644
--- a/platformio/builder/scripts/basearm.py
+++ b/platformio/builder/scripts/basearm.py
@@ -61,7 +61,7 @@ env.Replace(
     SIZEPRINTCMD='"$SIZETOOL" -B -d $SOURCES'
 )
 
-if env.get("BOARD_OPTIONS", {}).get("build", {}).get("cpu")[-2:] == "m4":
+if env.get("BOARD_OPTIONS", {}).get("build", {}).get("cpu", "")[-2:] == "m4":
     env.Append(
         ASFLAGS=[
             "-mfloat-abi=hard",
@@ -90,6 +90,17 @@ env.Append(
                 "$SOURCES",
                 "$TARGET"]),
             suffix=".bin"
+        ),
+        ElfToHex=Builder(
+            action=" ".join([
+                "$OBJCOPY",
+                "-O",
+                "ihex",
+                "-R",
+                ".eeprom",
+                "$SOURCES",
+                "$TARGET"]),
+            suffix=".hex"
         )
     )
 )
diff --git a/platformio/builder/scripts/teensy.py b/platformio/builder/scripts/teensy.py
index 9e3bb86e..1f48b60d 100644
--- a/platformio/builder/scripts/teensy.py
+++ b/platformio/builder/scripts/teensy.py
@@ -69,16 +69,10 @@ target_elf = env.BuildFirmware(["m"] + CORELIBS)
 # Target: Build the firmware file
 #
 
-if "cortex" in env.get("BOARD_OPTIONS").get("build").get("cpu", ""):
-    if "uploadlazy" in COMMAND_LINE_TARGETS:
-        target_firm = join("$BUILD_DIR", "firmware.bin")
-    else:
-        target_firm = env.ElfToBin(join("$BUILD_DIR", "firmware"), target_elf)
+if "uploadlazy" in COMMAND_LINE_TARGETS:
+    target_firm = join("$BUILD_DIR", "firmware.hex")
 else:
-    if "uploadlazy" in COMMAND_LINE_TARGETS:
-        target_firm = join("$BUILD_DIR", "firmware.hex")
-    else:
-        target_firm = env.ElfToHex(join("$BUILD_DIR", "firmware"), target_elf)
+    target_firm = env.ElfToHex(join("$BUILD_DIR", "firmware"), target_elf)
 
 #
 # Target: Print binary size