From 29f116275332aaaed117593996551446465be2f5 Mon Sep 17 00:00:00 2001 From: mikee47 Date: Tue, 7 Jan 2025 12:03:29 +0000 Subject: [PATCH] Remove redundant hardware config overrides spiffs-two-roms already defines both ROM slots as OTA. --- .../OtaUpgradeMqtt/samples/Upgrade/component.mk | 2 +- Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/ota.hw | 11 ----------- samples/Basic_Ota/ota.hw | 6 ------ 3 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/ota.hw diff --git a/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/component.mk b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/component.mk index b396b06b89..c6bf59b987 100644 --- a/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/component.mk +++ b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/component.mk @@ -49,7 +49,7 @@ COMPONENT_DEPENDS := OtaUpgradeMqtt RBOOT_ENABLED := 1 ## Use standard hardware config with two ROM slots and two SPIFFS partitions -HWCONFIG := ota +HWCONFIG := spiffs-two-roms APP_CFLAGS = -DMQTT_URL="\"$(MQTT_URL)"\" \ -DMQTT_FINGERPRINT_SHA1=$(MQTT_FINGERPRINT_SHA1) \ diff --git a/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/ota.hw b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/ota.hw deleted file mode 100644 index c5d71daa72..0000000000 --- a/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/ota.hw +++ /dev/null @@ -1,11 +0,0 @@ -{ - "base_config": "spiffs-two-roms", - "partitions": { - "rom0": { - "subtype": "ota_0" - }, - "rom1": { - "subtype": "ota_1" - } - } -} \ No newline at end of file diff --git a/samples/Basic_Ota/ota.hw b/samples/Basic_Ota/ota.hw index ed59f038c9..c9f0e9307e 100644 --- a/samples/Basic_Ota/ota.hw +++ b/samples/Basic_Ota/ota.hw @@ -2,12 +2,6 @@ "name": "Basic OTA sample", "base_config": "spiffs-two-roms", "partitions": { - "rom0": { - "subtype": "ota_0" - }, - "rom1": { - "subtype": "ota_1" - }, "spiffs0": { "size": "512K" },