From 3b6ead1f321960c71807ac292c5ba173238bbacb Mon Sep 17 00:00:00 2001 From: WanqQixiang Date: Wed, 21 Sep 2022 15:28:22 +0800 Subject: [PATCH] example: temporarily disable ota for esp32h2 --- examples/light/partitions_h2.csv | 8 +++----- examples/light/sdkconfig.defaults.esp32h2 | 4 +++- examples/light_switch/partitions_h2.csv | 8 +++----- examples/light_switch/sdkconfig.defaults.esp32h2 | 4 +++- examples/zap_light/partitions_h2.csv | 8 +++----- examples/zap_light/sdkconfig.defaults.esp32h2 | 4 +++- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/examples/light/partitions_h2.csv b/examples/light/partitions_h2.csv index 5fc6c06a9..7d1b2a4f8 100644 --- a/examples/light/partitions_h2.csv +++ b/examples/light/partitions_h2.csv @@ -2,9 +2,7 @@ # Note: Firmware partition offset needs to be 64K aligned, initial 36K (9 sectors) are reserved for bootloader and partition table sec_cert, 0x3F, ,0xd000, 0x3000, , # Never mark this as an encrypted partition nvs, data, nvs, 0x10000, 0x6000, -otadata, data, ota, , 0x2000 phy_init, data, phy, , 0x1000, -ota_0, app, ota_0, 0x20000, 0x1E0000, -ota_1, app, ota_1, 0x200000, 0x1E0000, -fctry, data, nvs, 0x3E0000, 0x6000, -ot_storage,data, fat, , 0x6000, +# Temporarily disable ota for ESP32-H2 because the use of flash need to be optimized. +factory, app, factory, , 0x1C0000, +ot_storage,data, fat, , 0x6000, diff --git a/examples/light/sdkconfig.defaults.esp32h2 b/examples/light/sdkconfig.defaults.esp32h2 index 284707ca2..21d7bde1c 100644 --- a/examples/light/sdkconfig.defaults.esp32h2 +++ b/examples/light/sdkconfig.defaults.esp32h2 @@ -9,6 +9,7 @@ CONFIG_ESPTOOLPY_FLASHFREQ_40M=y CONFIG_ESPTOOLPY_FLASHFREQ="40m" CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 +CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y # libsodium CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y @@ -54,7 +55,7 @@ CONFIG_USE_MINIMAL_MDNS=n CONFIG_ENABLE_EXTENDED_DISCOVERY=y # Enable OTA Requestor -CONFIG_ENABLE_OTA_REQUESTOR=y +CONFIG_ENABLE_OTA_REQUESTOR=n # Disable STA and AP for ESP32H2 CONFIG_ENABLE_WIFI_STATION=n @@ -66,3 +67,4 @@ CONFIG_BUTTON_LONG_PRESS_TIME_MS=5000 # Enable chip shell CONFIG_ENABLE_CHIP_SHELL=y + diff --git a/examples/light_switch/partitions_h2.csv b/examples/light_switch/partitions_h2.csv index 5fc6c06a9..7d1b2a4f8 100644 --- a/examples/light_switch/partitions_h2.csv +++ b/examples/light_switch/partitions_h2.csv @@ -2,9 +2,7 @@ # Note: Firmware partition offset needs to be 64K aligned, initial 36K (9 sectors) are reserved for bootloader and partition table sec_cert, 0x3F, ,0xd000, 0x3000, , # Never mark this as an encrypted partition nvs, data, nvs, 0x10000, 0x6000, -otadata, data, ota, , 0x2000 phy_init, data, phy, , 0x1000, -ota_0, app, ota_0, 0x20000, 0x1E0000, -ota_1, app, ota_1, 0x200000, 0x1E0000, -fctry, data, nvs, 0x3E0000, 0x6000, -ot_storage,data, fat, , 0x6000, +# Temporarily disable ota for ESP32-H2 because the use of flash need to be optimized. +factory, app, factory, , 0x1C0000, +ot_storage,data, fat, , 0x6000, diff --git a/examples/light_switch/sdkconfig.defaults.esp32h2 b/examples/light_switch/sdkconfig.defaults.esp32h2 index 284707ca2..21d7bde1c 100644 --- a/examples/light_switch/sdkconfig.defaults.esp32h2 +++ b/examples/light_switch/sdkconfig.defaults.esp32h2 @@ -9,6 +9,7 @@ CONFIG_ESPTOOLPY_FLASHFREQ_40M=y CONFIG_ESPTOOLPY_FLASHFREQ="40m" CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 +CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y # libsodium CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y @@ -54,7 +55,7 @@ CONFIG_USE_MINIMAL_MDNS=n CONFIG_ENABLE_EXTENDED_DISCOVERY=y # Enable OTA Requestor -CONFIG_ENABLE_OTA_REQUESTOR=y +CONFIG_ENABLE_OTA_REQUESTOR=n # Disable STA and AP for ESP32H2 CONFIG_ENABLE_WIFI_STATION=n @@ -66,3 +67,4 @@ CONFIG_BUTTON_LONG_PRESS_TIME_MS=5000 # Enable chip shell CONFIG_ENABLE_CHIP_SHELL=y + diff --git a/examples/zap_light/partitions_h2.csv b/examples/zap_light/partitions_h2.csv index 5fc6c06a9..7d1b2a4f8 100644 --- a/examples/zap_light/partitions_h2.csv +++ b/examples/zap_light/partitions_h2.csv @@ -2,9 +2,7 @@ # Note: Firmware partition offset needs to be 64K aligned, initial 36K (9 sectors) are reserved for bootloader and partition table sec_cert, 0x3F, ,0xd000, 0x3000, , # Never mark this as an encrypted partition nvs, data, nvs, 0x10000, 0x6000, -otadata, data, ota, , 0x2000 phy_init, data, phy, , 0x1000, -ota_0, app, ota_0, 0x20000, 0x1E0000, -ota_1, app, ota_1, 0x200000, 0x1E0000, -fctry, data, nvs, 0x3E0000, 0x6000, -ot_storage,data, fat, , 0x6000, +# Temporarily disable ota for ESP32-H2 because the use of flash need to be optimized. +factory, app, factory, , 0x1C0000, +ot_storage,data, fat, , 0x6000, diff --git a/examples/zap_light/sdkconfig.defaults.esp32h2 b/examples/zap_light/sdkconfig.defaults.esp32h2 index 284707ca2..21d7bde1c 100644 --- a/examples/zap_light/sdkconfig.defaults.esp32h2 +++ b/examples/zap_light/sdkconfig.defaults.esp32h2 @@ -9,6 +9,7 @@ CONFIG_ESPTOOLPY_FLASHFREQ_40M=y CONFIG_ESPTOOLPY_FLASHFREQ="40m" CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 +CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y # libsodium CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y @@ -54,7 +55,7 @@ CONFIG_USE_MINIMAL_MDNS=n CONFIG_ENABLE_EXTENDED_DISCOVERY=y # Enable OTA Requestor -CONFIG_ENABLE_OTA_REQUESTOR=y +CONFIG_ENABLE_OTA_REQUESTOR=n # Disable STA and AP for ESP32H2 CONFIG_ENABLE_WIFI_STATION=n @@ -66,3 +67,4 @@ CONFIG_BUTTON_LONG_PRESS_TIME_MS=5000 # Enable chip shell CONFIG_ENABLE_CHIP_SHELL=y +