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
This commit is contained in:
commit
fab35cb307
3 changed files with 3 additions and 3 deletions
2
.gitmodules
vendored
2
.gitmodules
vendored
|
@ -3,7 +3,7 @@
|
||||||
url = https://github.com/espressif/esp32-wifi-lib.git
|
url = https://github.com/espressif/esp32-wifi-lib.git
|
||||||
[submodule "components/esptool_py/esptool"]
|
[submodule "components/esptool_py/esptool"]
|
||||||
path = 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"]
|
[submodule "components/bt/lib"]
|
||||||
path = components/bt/lib
|
path = components/bt/lib
|
||||||
url = https://github.com/espressif/esp32-bt-lib.git
|
url = https://github.com/espressif/esp32-bt-lib.git
|
||||||
|
|
|
@ -29,7 +29,7 @@ endif
|
||||||
|
|
||||||
ESPTOOL_ELF2IMAGE_OPTIONS :=
|
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)
|
ESPTOOL_ALL_FLASH_ARGS += $(CONFIG_APP_OFFSET) $(APP_BIN)
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit fe69994270e2a450aad3e94a409b58460b1a214f
|
Subproject commit e9e9179f6fc3f2ecfc568987d3224b5e53a05f06
|
Loading…
Reference in a new issue