espressif/esp-matter
1
0
Fork 0
mirror of https://github.com/espressif/esp-matter.git synced 2026-04-27 19:13:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'partition_c6' into 'main'

Browse Source 
examples: make ESP32C6 and ESP32H2 use the same partition table

See merge request app-frameworks/esp-matter!339
This commit is contained in:
Shu Chen
2023-04-11 10:08:33 +08:00
parent f796000ed6 97fc93655e
commit b5666463a0
13 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/en/developing.rst
+1 -1
View File
@@ -217,7 +217,7 @@ Choose IDF target.
- ESP32-C6 supports both the Wi-Fi and IEEE 802.15.4 radio, so you can run Wi-Fi or Thread matter example on it.
- To enable Thread, you should change the menuconfig options to ``CONFIG_OPENTHREAD_ENABLED=y``, ``CONFIG_ENABLE_WIFI_STATION=n``, and ``CONFIG_USE_MINIMAL_MDNS=n``.
- To enable Wi-Fi. you should change the menuconfig options to ``CONFIG_OPENTHREAD_ENABLED=n``, ``CONFIG_ENABLE_WIFI_STATION=n``, and ``CONFIG_USE_MINIMAL_MDNS=y``.
- To enable Wi-Fi. you should change the menuconfig options to ``CONFIG_OPENTHREAD_ENABLED=n``, ``CONFIG_ENABLE_WIFI_STATION=y``, and ``CONFIG_USE_MINIMAL_MDNS=y``.
(When flashing the SDK for the first time, it is recommended to do
``idf.py erase_flash`` to wipe out entire flash and start out fresh.)
examples/generic_switch/partitions_c6.csv → examples/generic_switch/partitions_thread.csv
+1
View File
@@ -6,4 +6,5 @@ nvs_keys, data, nvs_keys, , 0x1000, encrypted
phy_init, data, phy, , 0x1000,
ota_0, app, ota_0, , 0x1C0000,
ota_1, app, ota_1, , 0x1C0000,
# For Wi-Fi device, this partition can be deleted.
ot_storage,data, fat, , 0x6000,
1 # Name, Type, SubType, Offset, Size, Flags
6 phy_init, data, phy, , 0x1000,
7 ota_0, app, ota_0, , 0x1C0000,
8 ota_1, app, ota_1, , 0x1C0000,
9 # For Wi-Fi device, this partition can be deleted.
10 ot_storage,data, fat, , 0x6000,
examples/generic_switch/sdkconfig.defaults.esp32c6
+1 -1
View File
@@ -35,7 +35,7 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=n
# Use a custom partition table
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_c6.csv"
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_thread.csv"
# LwIP config for OpenThread
CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
examples/generic_switch/sdkconfig.defaults.esp32h2
+1 -1
View File
@@ -36,7 +36,7 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=n
# Use a custom partition table
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_h2.csv"
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_thread.csv"
# LwIP config for OpenThread
CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
examples/generic_switch/partitions_h2.csv → examples/light/partitions_thread.csv
+1
View File
@@ -6,4 +6,5 @@ nvs_keys, data, nvs_keys, , 0x1000, encrypted
phy_init, data, phy, , 0x1000,
ota_0, app, ota_0, , 0x1C0000,
ota_1, app, ota_1, , 0x1C0000,
# For Wi-Fi device, this partition can be deleted.
ot_storage,data, fat, , 0x6000,
1 # Name, Type, SubType, Offset, Size, Flags
6 phy_init, data, phy, , 0x1000,
7 ota_0, app, ota_0, , 0x1C0000,
8 ota_1, app, ota_1, , 0x1C0000,
9 # For Wi-Fi device, this partition can be deleted.
10 ot_storage,data, fat, , 0x6000,
examples/light/sdkconfig.defaults.esp32c6
+1 -1
View File
@@ -30,7 +30,7 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=n
# Use a custom partition table
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_thread.csv"
# LwIP config for OpenThread
CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
examples/light/sdkconfig.defaults.esp32h2
+1 -1
View File
@@ -36,7 +36,7 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=n
# Use a custom partition table
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_h2.csv"
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_thread.csv"
# LwIP config for OpenThread
CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
examples/light/partitions_h2.csv → examples/light_switch/partitions_thread.csv
+1
View File
@@ -6,4 +6,5 @@ nvs_keys, data, nvs_keys, , 0x1000, encrypted
phy_init, data, phy, , 0x1000,
ota_0, app, ota_0, , 0x1C0000,
ota_1, app, ota_1, , 0x1C0000,
# For Wi-Fi device, this partition can be deleted.
ot_storage,data, fat, , 0x6000,
1 # Name, Type, SubType, Offset, Size, Flags
6 phy_init, data, phy, , 0x1000,
7 ota_0, app, ota_0, , 0x1C0000,
8 ota_1, app, ota_1, , 0x1C0000,
9 # For Wi-Fi device, this partition can be deleted.
10 ot_storage,data, fat, , 0x6000,
examples/light_switch/sdkconfig.defaults.esp32c6
+1 -1
View File
@@ -35,7 +35,7 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=n
# Use a custom partition table
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_c6.csv"
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_thread.csv"
# LwIP config for OpenThread
CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
examples/light_switch/sdkconfig.defaults.esp32h2
+1 -1
View File
@@ -36,7 +36,7 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=n
# Use a custom partition table
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_h2.csv"
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_thread.csv"
# LwIP config for OpenThread
CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
examples/zap_light/partitions_h2.csv
-9
View File
@@ -1,9 +0,0 @@
# Name, Type, SubType, Offset, Size, Flags
# Note: Firmware partition offset needs to be 64K aligned, initial 36K (9 sectors) are reserved for bootloader and partition table
esp_secure_cert, 0x3F, ,0xd000, 0x2000, encrypted
nvs, data, nvs, 0x10000, 0x6000,
nvs_keys, data, nvs_keys, , 0x1000, encrypted
phy_init, data, phy, , 0x1000,
ota_0, app, ota_0, , 0x1C0000,
ota_1, app, ota_1, , 0x1C0000,
ot_storage,data, fat, , 0x6000,
1 # Name, Type, SubType, Offset, Size, Flags
2 # Note: Firmware partition offset needs to be 64K aligned, initial 36K (9 sectors) are reserved for bootloader and partition table
3 esp_secure_cert, 0x3F, ,0xd000, 0x2000, encrypted
4 nvs, data, nvs, 0x10000, 0x6000,
5 nvs_keys, data, nvs_keys, , 0x1000, encrypted
6 phy_init, data, phy, , 0x1000,
7 ota_0, app, ota_0, , 0x1C0000,
8 ota_1, app, ota_1, , 0x1C0000,
9 ot_storage,data, fat, , 0x6000,
examples/light_switch/partitions_h2.csv → examples/zap_light/partitions_thread.csv
+1
View File
@@ -6,4 +6,5 @@ nvs_keys, data, nvs_keys, , 0x1000, encrypted
phy_init, data, phy, , 0x1000,
ota_0, app, ota_0, , 0x1C0000,
ota_1, app, ota_1, , 0x1C0000,
# For Wi-Fi device, this partition can be deleted.
ot_storage,data, fat, , 0x6000,
1 # Name, Type, SubType, Offset, Size, Flags
6 phy_init, data, phy, , 0x1000,
7 ota_0, app, ota_0, , 0x1C0000,
8 ota_1, app, ota_1, , 0x1C0000,
9 # For Wi-Fi device, this partition can be deleted.
10 ot_storage,data, fat, , 0x6000,
examples/zap_light/sdkconfig.defaults.esp32h2
+1 -1
View File
@@ -36,7 +36,7 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=n
# Use a custom partition table
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_h2.csv"
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_thread.csv"
# LwIP config for OpenThread
CONFIG_LWIP_IPV6_NUM_ADDRESSES=8