File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -14,6 +14,7 @@ FROZEN_MPY_DIR = modules
1414# include py core make definitions
1515include ../py/py.mk
1616
17+ FWBIN = $(BUILD ) /firmware-combined.bin
1718PORT ?= /dev/ttyACM0
1819BAUD ?= 115200
1920FLASH_MODE ?= qio
@@ -159,7 +160,7 @@ SRC_QSTR += $(SRC_C) $(STM_SRC_C) $(EXTMOD_SRC_C) $(DRIVERS_SRC_C)
159160# Append any auto-generated sources that are needed by sources listed in SRC_QSTR
160161SRC_QSTR_AUTO_DEPS +=
161162
162- all : $(BUILD ) /libaxtls.a $(BUILD ) /firmware-combined.bin
163+ all : $(BUILD ) /libaxtls.a $(FWBIN )
163164
164165CONFVARS_FILE = $(BUILD ) /confvars
165166
@@ -187,7 +188,7 @@ erase:
187188reset :
188189 echo -e " \r\nimport machine; machine.reset()\r\n" > $(PORT )
189190
190- $(BUILD ) /firmware-combined.bin : $(BUILD ) /firmware.elf
191+ $(FWBIN ) : $(BUILD ) /firmware.elf
191192 $(ECHO ) " Create $@ "
192193 $(Q ) esptool.py elf2image $^
193194 $(Q )$(PYTHON ) makeimg.py $(BUILD ) /firmware.elf-0x00000.bin $(BUILD ) /firmware.elf-0x[0-5][1-f]000.bin $@
@@ -202,7 +203,7 @@ $(BUILD)/firmware.elf: $(OBJ)
202203
203204ota :
204205 rm -f $(BUILD ) /firmware.elf $(BUILD ) /firmware.elf* .bin
205- $(MAKE ) LDSCRIPT=esp8266_ota.ld
206+ $(MAKE ) LDSCRIPT=esp8266_ota.ld FWBIN=firmware-ota.bin
206207
207208# MAKE_PINS = boards/make-pins.py
208209# BOARD_PINS = boards/$(BOARD)/pins.csv
You can’t perform that action at this time.
0 commit comments