Skip to content

Commit 83fec9a

Browse files
committed
Merge branch 'temporarily-remove-ota-esp32h2' into 'main'
Example: Temporarily disable ota for esp32h2 See merge request app-frameworks/esp-matter!195
2 parents 56ac216 + 3b6ead1 commit 83fec9a

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

examples/light/partitions_h2.csv

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
# Note: Firmware partition offset needs to be 64K aligned, initial 36K (9 sectors) are reserved for bootloader and partition table
33
sec_cert, 0x3F, ,0xd000, 0x3000, , # Never mark this as an encrypted partition
44
nvs, data, nvs, 0x10000, 0x6000,
5-
otadata, data, ota, , 0x2000
65
phy_init, data, phy, , 0x1000,
7-
ota_0, app, ota_0, 0x20000, 0x1E0000,
8-
ota_1, app, ota_1, 0x200000, 0x1E0000,
9-
fctry, data, nvs, 0x3E0000, 0x6000,
10-
ot_storage,data, fat, , 0x6000,
6+
# Temporarily disable ota for ESP32-H2 because the use of flash need to be optimized.
7+
factory, app, factory, , 0x1C0000,
8+
ot_storage,data, fat, , 0x6000,

examples/light/sdkconfig.defaults.esp32h2

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
99
CONFIG_ESPTOOLPY_FLASHFREQ="40m"
1010
CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
1111
CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
12+
CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y
1213

1314
# libsodium
1415
CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y
@@ -54,7 +55,7 @@ CONFIG_USE_MINIMAL_MDNS=n
5455
CONFIG_ENABLE_EXTENDED_DISCOVERY=y
5556

5657
# Enable OTA Requestor
57-
CONFIG_ENABLE_OTA_REQUESTOR=y
58+
CONFIG_ENABLE_OTA_REQUESTOR=n
5859

5960
# Disable STA and AP for ESP32H2
6061
CONFIG_ENABLE_WIFI_STATION=n
@@ -66,3 +67,4 @@ CONFIG_BUTTON_LONG_PRESS_TIME_MS=5000
6667

6768
# Enable chip shell
6869
CONFIG_ENABLE_CHIP_SHELL=y
70+

examples/light_switch/partitions_h2.csv

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
# Note: Firmware partition offset needs to be 64K aligned, initial 36K (9 sectors) are reserved for bootloader and partition table
33
sec_cert, 0x3F, ,0xd000, 0x3000, , # Never mark this as an encrypted partition
44
nvs, data, nvs, 0x10000, 0x6000,
5-
otadata, data, ota, , 0x2000
65
phy_init, data, phy, , 0x1000,
7-
ota_0, app, ota_0, 0x20000, 0x1E0000,
8-
ota_1, app, ota_1, 0x200000, 0x1E0000,
9-
fctry, data, nvs, 0x3E0000, 0x6000,
10-
ot_storage,data, fat, , 0x6000,
6+
# Temporarily disable ota for ESP32-H2 because the use of flash need to be optimized.
7+
factory, app, factory, , 0x1C0000,
8+
ot_storage,data, fat, , 0x6000,

examples/light_switch/sdkconfig.defaults.esp32h2

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
99
CONFIG_ESPTOOLPY_FLASHFREQ="40m"
1010
CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
1111
CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
12+
CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y
1213

1314
# libsodium
1415
CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y
@@ -54,7 +55,7 @@ CONFIG_USE_MINIMAL_MDNS=n
5455
CONFIG_ENABLE_EXTENDED_DISCOVERY=y
5556

5657
# Enable OTA Requestor
57-
CONFIG_ENABLE_OTA_REQUESTOR=y
58+
CONFIG_ENABLE_OTA_REQUESTOR=n
5859

5960
# Disable STA and AP for ESP32H2
6061
CONFIG_ENABLE_WIFI_STATION=n
@@ -66,3 +67,4 @@ CONFIG_BUTTON_LONG_PRESS_TIME_MS=5000
6667

6768
# Enable chip shell
6869
CONFIG_ENABLE_CHIP_SHELL=y
70+

examples/zap_light/partitions_h2.csv

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
# Note: Firmware partition offset needs to be 64K aligned, initial 36K (9 sectors) are reserved for bootloader and partition table
33
sec_cert, 0x3F, ,0xd000, 0x3000, , # Never mark this as an encrypted partition
44
nvs, data, nvs, 0x10000, 0x6000,
5-
otadata, data, ota, , 0x2000
65
phy_init, data, phy, , 0x1000,
7-
ota_0, app, ota_0, 0x20000, 0x1E0000,
8-
ota_1, app, ota_1, 0x200000, 0x1E0000,
9-
fctry, data, nvs, 0x3E0000, 0x6000,
10-
ot_storage,data, fat, , 0x6000,
6+
# Temporarily disable ota for ESP32-H2 because the use of flash need to be optimized.
7+
factory, app, factory, , 0x1C0000,
8+
ot_storage,data, fat, , 0x6000,

examples/zap_light/sdkconfig.defaults.esp32h2

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
99
CONFIG_ESPTOOLPY_FLASHFREQ="40m"
1010
CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
1111
CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
12+
CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y
1213

1314
# libsodium
1415
CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y
@@ -54,7 +55,7 @@ CONFIG_USE_MINIMAL_MDNS=n
5455
CONFIG_ENABLE_EXTENDED_DISCOVERY=y
5556

5657
# Enable OTA Requestor
57-
CONFIG_ENABLE_OTA_REQUESTOR=y
58+
CONFIG_ENABLE_OTA_REQUESTOR=n
5859

5960
# Disable STA and AP for ESP32H2
6061
CONFIG_ENABLE_WIFI_STATION=n
@@ -66,3 +67,4 @@ CONFIG_BUTTON_LONG_PRESS_TIME_MS=5000
6667

6768
# Enable chip shell
6869
CONFIG_ENABLE_CHIP_SHELL=y
70+

0 commit comments

Comments
 (0)