Przeglądaj źródła

Merge branch 'feature/esptool_v20_beta' into 'master'

Update esptool.py to v2.0-beta1

* Minor bug fixes, no major functionality changes from the esp-idf perspective.
* Now tracks master branch of esptool repo (finally!)
* Supports Python 3, although our other esp-idf Python tools don't yet support Python 3.

See merge request !396

Angus Gratton 9 lat temu
rodzic
commit
fab35cb307

+ 1 - 1
.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

+ 1 - 1
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)
 

+ 1 - 1
components/esptool_py/esptool

@@ -1 +1 @@
-Subproject commit fe69994270e2a450aad3e94a409b58460b1a214f
+Subproject commit e9e9179f6fc3f2ecfc568987d3224b5e53a05f06