diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2018-05-02 10:02:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-02 10:02:32 -0700 |
| commit | 41101bc2c6c9cdcb5be39e9b21365aaff34c581e (patch) | |
| tree | 93e264b595557dac776ba442480c77a622b2f4d5 | |
| parent | 61d3dd85ecbe57a51907e4ecde056ed658e62006 (diff) | |
| parent | 3e35cbcd5b3e15afae268f9dedb1e285124e61d9 (diff) | |
Merge pull request #794 from larsks/bug/793
allow esptool.py invocation to be set via make vars
| -rw-r--r-- | ports/esp8266/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile index 06439a19e..8fabd3412 100644 --- a/ports/esp8266/Makefile +++ b/ports/esp8266/Makefile @@ -32,6 +32,7 @@ FLASH_MODE ?= qio FLASH_SIZE ?= detect CROSS_COMPILE = xtensa-lx106-elf- ESP_SDK = $(shell $(CC) -print-sysroot)/usr +ESPTOOL = esptool.py INC += -I. INC += -I$(TOP) @@ -230,18 +231,18 @@ FROZEN_EXTRA_DEPS = $(CONFVARS_FILE) deploy: $(BUILD)/firmware-combined.bin $(ECHO) "Writing $< to the board" - $(Q)esptool.py --port $(PORT) --baud $(BAUD) write_flash --verify --flash_size=$(FLASH_SIZE) --flash_mode=$(FLASH_MODE) 0 $< + $(Q)$(ESPTOOL) --port $(PORT) --baud $(BAUD) write_flash --verify --flash_size=$(FLASH_SIZE) --flash_mode=$(FLASH_MODE) 0 $< erase: $(ECHO) "Erase flash" - $(Q)esptool.py --port $(PORT) --baud $(BAUD) erase_flash + $(Q)$(ESPTOOL) --port $(PORT) --baud $(BAUD) erase_flash reset: echo -e "\r\nimport machine; machine.reset()\r\n" >$(PORT) $(FWBIN): $(BUILD)/firmware.elf $(ECHO) "Create $@" - $(Q)python2 $(shell which esptool.py) elf2image $^ + $(Q)$(ESPTOOL) elf2image $^ $(Q)$(PYTHON) makeimg.py $(BUILD)/firmware.elf-0x00000.bin $(BUILD)/firmware.elf-0x[0-5][1-f]000.bin $@ |