esptool.py & Makefile: Fix compressed upload support (enabled by default)

diff --git a/components/bootloader/Makefile.projbuild b/components/bootloader/Makefile.projbuild
index 073112febd8615464d75a12e48d2b3e7134e1a67..c80878d4238a9f88c844f4bf51e7542ba11f9e45 100644 (file)
--- a/components/bootloader/Makefile.projbuild
+++ b/components/bootloader/Makefile.projbuild
@@ -33,7 +33,7 @@ clean: bootloader-clean
 
 bootloader: $(BOOTLOADER_BIN)
        @echo "Bootloader built. Default flash command is:"
-       @echo "$(ESPTOOLPY_SERIAL) write_flash 0x1000 $(BOOTLOADER_BIN)"
+       @echo "$(ESPTOOLPY_WRITE_FLASH) 0x1000 $(BOOTLOADER_BIN)"
 
 all_binaries: $(BOOTLOADER_BIN)
 

diff --git a/components/esptool_py/Makefile.projbuild b/components/esptool_py/Makefile.projbuild
index c9000076f2adce98f3946af38a4f4f248771de01..576e526d569d4d4bea2b9b6821239393970672c7 100644 (file)
--- a/components/esptool_py/Makefile.projbuild
+++ b/components/esptool_py/Makefile.projbuild
@@ -12,7 +12,8 @@ PYTHON ?= $(call dequote,$(CONFIG_PYTHON))
 ESPTOOLPY := $(PYTHON) $(IDF_PATH)/bin/esptool.py --chip esp32
 ESPTOOLPY_SERIAL := $(ESPTOOLPY) --port $(ESPPORT) --baud $(ESPBAUD)
 
-APP_FLASH_COMMAND=$(ESPTOOLPY_SERIAL) write_flash $(CONFIG_APP_OFFSET) $(APP_BIN)
+ESPTOOLPY_WRITE_FLASH=$(ESPTOOLPY_SERIAL) write_flash $(if $(CONFIG_ESPTOOLPY_COMPRESSED),-z)
+
 ESPTOOL_ALL_FLASH_ARGS += $(CONFIG_APP_OFFSET) $(APP_BIN)
 
 $(APP_BIN): $(APP_ELF)
@@ -20,7 +21,7 @@ $(APP_BIN): $(APP_ELF)
 
 flash: all_binaries
        @echo "Flashing project app to $(CONFIG_APP_OFFSET)..."
-       $(Q) $(ESPTOOLPY_SERIAL) write_flash $(ESPTOOL_ALL_FLASH_ARGS)
+       $(Q) $(ESPTOOLPY_WRITE_FLASH) $(ESPTOOL_ALL_FLASH_ARGS)
 
 app-flash: $(APP_BIN)
-       $(Q) $(APP_FLASH_COMMAND)
+       $(Q) $(ESPTOOLPY_WRITE_FLASH) $(CONFIG_APP_OFFSET) $(APP_BIN)

diff --git a/make/project.mk b/make/project.mk
index dd557e48a1af6e56f84cf4a65a128b7576999276..bfc9a2f7f6b025f2427423e52c5012461b9bbb72 100644 (file)
--- a/make/project.mk
+++ b/make/project.mk
@@ -13,7 +13,7 @@
 .PHONY: build-components menuconfig all build clean all_binaries
 all: all_binaries # other components will add dependencies to 'all_binaries'
        @echo "To flash all build output, run 'make flash' or:"
-       @echo $(ESPTOOLPY_SERIAL) write_flash $(ESPTOOL_ALL_FLASH_ARGS)
+       @echo $(ESPTOOLPY_WRITE_FLASH) $(ESPTOOL_ALL_FLASH_ARGS)
 
 # (the reason all_binaries is used instead of 'all' is so that the flash target
 # can build everything without triggering the per-component "to flash..."
@@ -174,7 +174,7 @@ $(APP_ELF): $(addsuffix -build,$(notdir $(COMPONENT_PATHS_BUILDABLE)))
 # component's Makefile.projbuild
 app: $(APP_BIN)
        @echo "App built. Default flash app command is:"
-       @echo $(APP_FLASH_COMMAND) # APP_FLASH_COMMAND is set in esptool_py's Makefile.projbuild
+       @echo $(ESPTOOLPY_WRITE_FLASH) $(CONFIG_APP_OFFSET) $(APP_BIN)
 
 all_binaries: $(APP_BIN)