Merge branch 'master' of github.com:SuperHouse/esp-open-rtos

This commit is contained in:
Angus Gratton 2015-08-05 14:24:10 +10:00
commit 5f82b3c27f

View file

@ -335,7 +335,7 @@ $(FW_FILE): $(PROGRAM_OUT) $(FW_BASE)
ifeq ($(OTA),0)
flash: $(FW_FILE_1) $(FW_FILE_2)
$(ESPTOOL) -p $(ESPPORT) --baud $(ESPBAUD) write_flash $(FW_ADDR_1) $(FW_FILE_1) $(FW_ADDR_2) $(FW_FILE_2)
$(ESPTOOL) -p $(ESPPORT) --baud $(ESPBAUD) write_flash $(FW_ADDR_2) $(FW_FILE_2) $(FW_ADDR_1) $(FW_FILE_1)
else
flash: $(FW_FILE)
$(vecho) "Flashing OTA image slot 0 (bootloader not updated)"