platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-30 01:57:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #87 from valeros/develop

Browse Source 
Fix teensy firmware file format
This commit is contained in:
Ivan Kravets
2015-02-19 11:06:24 +02:00
parent 8374199fae 239e1f3fe9
commit 8baf2ce241
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
platformio/builder/scripts/basearm.py
View File

@ -61,7 +61,7 @@ env.Replace(
SIZEPRINTCMD='"$SIZETOOL" -B -d $SOURCES' 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( env.Append(
ASFLAGS=[ ASFLAGS=[
"-mfloat-abi=hard", "-mfloat-abi=hard",
@ -90,6 +90,17 @@ env.Append(
"$SOURCES", "$SOURCES",
"$TARGET"]), "$TARGET"]),
suffix=".bin" suffix=".bin"
),
ElfToHex=Builder(
action=" ".join([
"$OBJCOPY",
"-O",
"ihex",
"-R",
".eeprom",
"$SOURCES",
"$TARGET"]),
suffix=".hex"
) )
) )
) )

12
platformio/builder/scripts/teensy.py
View File

@ -69,16 +69,10 @@ target_elf = env.BuildFirmware(["m"] + CORELIBS)
# Target: Build the firmware file # Target: Build the firmware file
# #
if "cortex" in env.get("BOARD_OPTIONS").get("build").get("cpu", ""): if "uploadlazy" in COMMAND_LINE_TARGETS:
if "uploadlazy" in COMMAND_LINE_TARGETS: target_firm = join("$BUILD_DIR", "firmware.hex")
target_firm = join("$BUILD_DIR", "firmware.bin")
else:
target_firm = env.ElfToBin(join("$BUILD_DIR", "firmware"), target_elf)
else: else:
if "uploadlazy" in COMMAND_LINE_TARGETS: target_firm = env.ElfToHex(join("$BUILD_DIR", "firmware"), target_elf)
target_firm = join("$BUILD_DIR", "firmware.hex")
else:
target_firm = env.ElfToHex(join("$BUILD_DIR", "firmware"), target_elf)
# #
# Target: Print binary size # Target: Print binary size