From c4b3f6bbbc4b10d126ab3fa80a09899337f75597 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Tue, 10 Jan 2017 14:04:54 +1100 Subject: [PATCH] Update esptool.py to v2.0-beta1 Minor bug fixes, no major functionality changes. --- .gitmodules | 2 +- components/esptool_py/Makefile.projbuild | 2 +- components/esptool_py/esptool | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9cba0ec5e..6a6af0e9d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ url = https://github.com/espressif/esp32-wifi-lib.git [submodule "components/esptool_py/esptool"] path = components/esptool_py/esptool - url = https://github.com/themadinventor/esptool.git + url = https://github.com/espressif/esptool.git [submodule "components/bt/lib"] path = components/bt/lib url = https://github.com/espressif/esp32-bt-lib.git diff --git a/components/esptool_py/Makefile.projbuild b/components/esptool_py/Makefile.projbuild index e249d1443..dfe8e1f42 100644 --- a/components/esptool_py/Makefile.projbuild +++ b/components/esptool_py/Makefile.projbuild @@ -29,7 +29,7 @@ endif ESPTOOL_ELF2IMAGE_OPTIONS := -ESPTOOLPY_WRITE_FLASH=$(ESPTOOLPY_SERIAL) write_flash $(if $(CONFIG_ESPTOOLPY_COMPRESSED),-z) $(ESPTOOL_WRITE_FLASH_OPTIONS) +ESPTOOLPY_WRITE_FLASH=$(ESPTOOLPY_SERIAL) write_flash $(if $(CONFIG_ESPTOOLPY_COMPRESSED),-z,-u) $(ESPTOOL_WRITE_FLASH_OPTIONS) ESPTOOL_ALL_FLASH_ARGS += $(CONFIG_APP_OFFSET) $(APP_BIN) diff --git a/components/esptool_py/esptool b/components/esptool_py/esptool index fe6999427..e9e9179f6 160000 --- a/components/esptool_py/esptool +++ b/components/esptool_py/esptool @@ -1 +1 @@ -Subproject commit fe69994270e2a450aad3e94a409b58460b1a214f +Subproject commit e9e9179f6fc3f2ecfc568987d3224b5e53a05f06