Skip to content

Commit 2df81e6

Browse files
committed
use python3 for hex merge
1 parent a4084e0 commit 2df81e6

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -344,23 +344,23 @@ $(BUILD)/$(OUT_FILE).out: $(BUILD) $(OBJECTS)
344344

345345
# Create hex file (no sd, no mbr)
346346
$(BUILD)/$(OUT_FILE).hex: $(BUILD)/$(OUT_FILE).out
347-
@echo CR $(notdir $@)
347+
@echo Create $(notdir $@)
348348
@$(OBJCOPY) -O ihex $< $@
349349

350350
# Hex file with mbr (still no SD)
351351
$(BUILD)/$(OUT_FILE)-nosd.hex: $(BUILD)/$(OUT_FILE).hex
352-
@echo CR $(notdir $@)
353-
@python tools/hexmerge.py --overlap=replace -o $@ $< $(MBR_HEX)
352+
@echo Create $(notdir $@)
353+
@python3 tools/hexmerge.py --overlap=replace -o $@ $< $(MBR_HEX)
354354

355355
# Bootolader only uf2
356356
$(BUILD)/$(OUT_FILE)-nosd.uf2: $(BUILD)/$(OUT_FILE)-nosd.hex
357-
@echo CR $(notdir $@)
358-
python lib/uf2/utils/uf2conv.py -f 0xd663823c -c -o $@ $^
357+
@echo Create $(notdir $@)
358+
@python3 lib/uf2/utils/uf2conv.py -f 0xd663823c -c -o $@ $^
359359

360360
# merge bootloader and sd hex together
361361
$(BUILD)/$(MERGED_FILE).hex: $(BUILD)/$(OUT_FILE).hex
362-
@echo CR $(notdir $@)
363-
@python tools/hexmerge.py -o $@ $< $(SD_HEX)
362+
@echo Create $(notdir $@)
363+
@python3 tools/hexmerge.py -o $@ $< $(SD_HEX)
364364

365365
# Create pkg zip file for bootloader+SD combo to use with DFU CDC
366366
$(BUILD)/$(MERGED_FILE).zip: $(BUILD)/$(OUT_FILE).hex

0 commit comments

Comments
 (0)