From 7c90deef3559778372d6b2cd15eca6a9e4c5ee7c Mon Sep 17 00:00:00 2001 From: slaff Date: Tue, 1 Jun 2021 10:19:35 +0200 Subject: [PATCH] Fixed an issue with Esp32 and OtaUpgrade. (#2335) --- Sming/Libraries/OtaUpgrade/component.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Sming/Libraries/OtaUpgrade/component.mk b/Sming/Libraries/OtaUpgrade/component.mk index 50bc8e66bc..c476d7cfea 100644 --- a/Sming/Libraries/OtaUpgrade/component.mk +++ b/Sming/Libraries/OtaUpgrade/component.mk @@ -148,7 +148,7 @@ ifneq ($(SMING_ARCH),Host) CUSTOM_TARGETS += ota-file endif -$(OTA_UPGRADE_FILE): $(RBOOT_ROM_0_BIN) $(RBOOT_ROM_1_BIN) $(OTA_KEY_IMAGE) +$(OTA_UPGRADE_FILE): $(PARTITION_factory_FILENAME) $(PARTITION_rom0_FILENAME) $(PARTITION_rom1_FILENAME) $(OTA_KEY_IMAGE) ifeq ($(ENABLE_OTA_DOWNGRADE),0) ifeq ($(OTA_CRYPTO_FEATURES),) $(warning WARNING: Downgrade protection ineffective without encryption or digital signature. \ @@ -158,8 +158,9 @@ endif $(Q) $(OTATOOL) mkfile \ $(OTA_CRYPTO_FEATURES_IMAGE) \ $(if $(OTA_CRYPTO_FEATURES_IMAGE),--key=$(OTA_KEY_IMAGE)) \ - --rom=$(RBOOT_ROM_0_BIN)@$(RBOOT_ROM0_ADDR) \ - $(if $(RBOOT_ROM_1_BIN),--rom=$(RBOOT_ROM_1_BIN)@$(RBOOT_ROM1_ADDR)) \ + $(if $(PARTITION_factory_FILENAME),--rom=$(PARTITION_factory_FILENAME)@$(PARTITION_factory_ADDRESS)) \ + $(if $(PARTITION_rom0_FILENAME),--rom=$(PARTITION_rom0_FILENAME)@$(PARTITION_rom0_ADDRESS)) \ + $(if $(PARTITION_rom1_FILENAME),--rom=$(PARTITION_rom1_FILENAME)@$(PARTITION_rom1_ADDRESS)) \ --output=$@ ifdef OTA_ROLLOVER_IN_PROGRESS @echo