Skip to content

Commit 605753c

Browse files
authored
Merge pull request #5771 from hathach/s3-familyid
use family id for s2 and s3 depending on IDF_TARGET
2 parents 35f0330 + 53869d7 commit 605753c

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

ports/espressif/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,9 +411,12 @@ $(BUILD)/circuitpython-firmware.bin: $(BUILD)/firmware.elf | tools/build_memory_
411411
$(BUILD)/firmware.bin: $(BUILD)/circuitpython-firmware.bin | esp-idf-stamp
412412
$(Q)$(PYTHON) ../../tools/join_bins.py $@ $(BOOTLOADER_OFFSET) $(BUILD)/esp-idf/bootloader/bootloader.bin $(PARTITION_TABLE_OFFSET) $(BUILD)/esp-idf/partition_table/partition-table.bin $(FIRMWARE_OFFSET) $(BUILD)/circuitpython-firmware.bin
413413

414+
UF2_FAMILY_ID_esp32s2 = 0xbfdd4eee
415+
UF2_FAMILY_ID_esp32s3 = 0xc47e5767
416+
414417
$(BUILD)/firmware.uf2: $(BUILD)/circuitpython-firmware.bin
415418
$(STEPECHO) "Create $@"
416-
$(Q)$(PYTHON) $(TOP)/tools/uf2/utils/uf2conv.py -f 0xbfdd4eee -b 0x0000 -c -o $@ $^
419+
$(Q)$(PYTHON) $(TOP)/tools/uf2/utils/uf2conv.py -f $(UF2_FAMILY_ID_$(IDF_TARGET)) -b 0x0000 -c -o $@ $^
417420

418421
flash: $(BUILD)/firmware.bin
419422
esptool.py --chip $(IDF_TARGET) -p $(PORT) $(ESPTOOL_FLAGS) write_flash $(FLASH_FLAGS) 0x0000 $^

0 commit comments

Comments
 (0)