From c96ffaaa50192915a2cba547bfabb38ed018d6e2 Mon Sep 17 00:00:00 2001 From: Jerry-ESP <107675966+Jerry-ESP@users.noreply.github.com> Date: Mon, 31 Jul 2023 17:28:14 +0800 Subject: [PATCH] add nvs size to 48k bytes for matter 1.1 (#28353) --- examples/all-clusters-app/esp32/partitions.csv | 2 +- examples/all-clusters-minimal-app/esp32/partitions.csv | 2 +- examples/bridge-app/esp32/partitions.csv | 4 ++-- examples/chef/esp32/partitions.csv | 2 +- examples/light-switch-app/esp32/partitions.csv | 2 +- examples/lighting-app/esp32/partitions.csv | 2 +- examples/lighting-app/esp32/partitions_encrypted.csv | 2 +- examples/lighting-app/esp32/partitions_h2.csv | 2 +- examples/lock-app/esp32/partitions.csv | 4 ++-- examples/ota-provider-app/esp32/partitions.csv | 2 +- examples/ota-requestor-app/esp32/partitions.csv | 2 +- examples/persistent-storage/esp32/partitions.csv | 4 ++-- examples/pigweed-app/esp32/partitions.csv | 4 ++-- examples/shell/esp32/partitions.csv | 4 ++-- examples/temperature-measurement-app/esp32/partitions.csv | 4 ++-- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/examples/all-clusters-app/esp32/partitions.csv b/examples/all-clusters-app/esp32/partitions.csv index 2211b30fa01a74..47172e25774ebb 100644 --- a/examples/all-clusters-app/esp32/partitions.csv +++ b/examples/all-clusters-app/esp32/partitions.csv @@ -1,6 +1,6 @@ # Name, Type, SubType, Offset, Size, Flags # Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap -nvs, data, nvs, , 0x6000, +nvs, data, nvs, , 0xC000, otadata, data, ota, , 0x2000, phy_init, data, phy, , 0x1000, ota_0, app, ota_0, , 1900K, diff --git a/examples/all-clusters-minimal-app/esp32/partitions.csv b/examples/all-clusters-minimal-app/esp32/partitions.csv index 43acef25d0245d..7d399d0f5dd48e 100644 --- a/examples/all-clusters-minimal-app/esp32/partitions.csv +++ b/examples/all-clusters-minimal-app/esp32/partitions.csv @@ -1,6 +1,6 @@ # Name, Type, SubType, Offset, Size, Flags # Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap -nvs, data, nvs, , 0x6000, +nvs, data, nvs, , 0xC000, otadata, data, ota, , 0x2000, phy_init, data, phy, , 0x1000, ota_0, app, ota_0, , 1500K, diff --git a/examples/bridge-app/esp32/partitions.csv b/examples/bridge-app/esp32/partitions.csv index b338ff11a11589..8b0928187b8708 100644 --- a/examples/bridge-app/esp32/partitions.csv +++ b/examples/bridge-app/esp32/partitions.csv @@ -1,6 +1,6 @@ # Name, Type, SubType, Offset, Size, Flags # Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap -nvs, data, nvs, , 0x6000, +nvs, data, nvs, , 0xC000, phy_init, data, phy, , 0x1000, # Factory partition size about 1.9MB -factory, app, factory, , 1945K, +factory, app, factory, , 1920K, diff --git a/examples/chef/esp32/partitions.csv b/examples/chef/esp32/partitions.csv index b338ff11a11589..c0855b66229dc4 100644 --- a/examples/chef/esp32/partitions.csv +++ b/examples/chef/esp32/partitions.csv @@ -1,6 +1,6 @@ # Name, Type, SubType, Offset, Size, Flags # Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap -nvs, data, nvs, , 0x6000, +nvs, data, nvs, , 0xC000, phy_init, data, phy, , 0x1000, # Factory partition size about 1.9MB factory, app, factory, , 1945K, diff --git a/examples/light-switch-app/esp32/partitions.csv b/examples/light-switch-app/esp32/partitions.csv index 9c801081f71c04..eb41fc9c431ff0 100644 --- a/examples/light-switch-app/esp32/partitions.csv +++ b/examples/light-switch-app/esp32/partitions.csv @@ -1,6 +1,6 @@ # Name, Type, SubType, Offset, Size, Flags # Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap -nvs, data, nvs, , 0x6000, +nvs, data, nvs, , 0xC000, otadata, data, ota, , 0x2000, phy_init, data, phy, , 0x1000, ota_0, app, ota_0, , 1500K, diff --git a/examples/lighting-app/esp32/partitions.csv b/examples/lighting-app/esp32/partitions.csv index 3753d8bcf13a35..428d873fa54a05 100644 --- a/examples/lighting-app/esp32/partitions.csv +++ b/examples/lighting-app/esp32/partitions.csv @@ -1,7 +1,7 @@ # 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, data, nvs, 0x10000, 0xC000, nvs_keys, data, nvs_keys,, 0x1000, otadata, data, ota, , 0x2000 phy_init, data, phy, , 0x1000, diff --git a/examples/lighting-app/esp32/partitions_encrypted.csv b/examples/lighting-app/esp32/partitions_encrypted.csv index 807ee35dc8e645..94ec9f7a2b7f17 100644 --- a/examples/lighting-app/esp32/partitions_encrypted.csv +++ b/examples/lighting-app/esp32/partitions_encrypted.csv @@ -1,6 +1,6 @@ # Name, Type, SubType, Offset, Size, Flags # Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap -nvs, data, nvs, , 0x6000, +nvs, data, nvs, , 0xC000, otadata, data, ota, , 0x2000, encrypted phy_init, data, phy, , 0x1000, encrypted ota_0, app, ota_0, , 1500K, encrypted diff --git a/examples/lighting-app/esp32/partitions_h2.csv b/examples/lighting-app/esp32/partitions_h2.csv index 6d04b8d05e3a0a..16a8b0f7453040 100644 --- a/examples/lighting-app/esp32/partitions_h2.csv +++ b/examples/lighting-app/esp32/partitions_h2.csv @@ -1,6 +1,6 @@ # Name, Type, SubType, Offset, Size, Flags # Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap -nvs, data, nvs, , 0x6000, +nvs, data, nvs, , 0xC000, otadata, data, ota, , 0x2000, phy_init, data, phy, , 0x1000, ota_0, app, ota_0, , 1500K, diff --git a/examples/lock-app/esp32/partitions.csv b/examples/lock-app/esp32/partitions.csv index b338ff11a11589..8b0928187b8708 100644 --- a/examples/lock-app/esp32/partitions.csv +++ b/examples/lock-app/esp32/partitions.csv @@ -1,6 +1,6 @@ # Name, Type, SubType, Offset, Size, Flags # Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap -nvs, data, nvs, , 0x6000, +nvs, data, nvs, , 0xC000, phy_init, data, phy, , 0x1000, # Factory partition size about 1.9MB -factory, app, factory, , 1945K, +factory, app, factory, , 1920K, diff --git a/examples/ota-provider-app/esp32/partitions.csv b/examples/ota-provider-app/esp32/partitions.csv index 0d8e94e5c1f16a..009b96d704d596 100644 --- a/examples/ota-provider-app/esp32/partitions.csv +++ b/examples/ota-provider-app/esp32/partitions.csv @@ -1,6 +1,6 @@ # Name, Type, SubType, Offset, Size, Flags # Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap -nvs, data, nvs, , 0x6000, +nvs, data, nvs, , 0xC000, phy_init, data, phy, , 0x1000, # Factory partition size about 1.6MB factory, app, factory, , 1600K, diff --git a/examples/ota-requestor-app/esp32/partitions.csv b/examples/ota-requestor-app/esp32/partitions.csv index 56849bb3037058..421f1bef343436 100644 --- a/examples/ota-requestor-app/esp32/partitions.csv +++ b/examples/ota-requestor-app/esp32/partitions.csv @@ -1,6 +1,6 @@ # Name, Type, SubType, Offset, Size, Flags # Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap -nvs, data, nvs, , 0x6000, +nvs, data, nvs, , 0xC000, otadata, data, ota, , 0x2000, phy_init, data, phy, , 0x1000, # OTA partitions of size 1.5M each diff --git a/examples/persistent-storage/esp32/partitions.csv b/examples/persistent-storage/esp32/partitions.csv index b338ff11a11589..8b0928187b8708 100644 --- a/examples/persistent-storage/esp32/partitions.csv +++ b/examples/persistent-storage/esp32/partitions.csv @@ -1,6 +1,6 @@ # Name, Type, SubType, Offset, Size, Flags # Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap -nvs, data, nvs, , 0x6000, +nvs, data, nvs, , 0xC000, phy_init, data, phy, , 0x1000, # Factory partition size about 1.9MB -factory, app, factory, , 1945K, +factory, app, factory, , 1920K, diff --git a/examples/pigweed-app/esp32/partitions.csv b/examples/pigweed-app/esp32/partitions.csv index b338ff11a11589..8b0928187b8708 100644 --- a/examples/pigweed-app/esp32/partitions.csv +++ b/examples/pigweed-app/esp32/partitions.csv @@ -1,6 +1,6 @@ # Name, Type, SubType, Offset, Size, Flags # Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap -nvs, data, nvs, , 0x6000, +nvs, data, nvs, , 0xC000, phy_init, data, phy, , 0x1000, # Factory partition size about 1.9MB -factory, app, factory, , 1945K, +factory, app, factory, , 1920K, diff --git a/examples/shell/esp32/partitions.csv b/examples/shell/esp32/partitions.csv index b338ff11a11589..8b0928187b8708 100644 --- a/examples/shell/esp32/partitions.csv +++ b/examples/shell/esp32/partitions.csv @@ -1,6 +1,6 @@ # Name, Type, SubType, Offset, Size, Flags # Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap -nvs, data, nvs, , 0x6000, +nvs, data, nvs, , 0xC000, phy_init, data, phy, , 0x1000, # Factory partition size about 1.9MB -factory, app, factory, , 1945K, +factory, app, factory, , 1920K, diff --git a/examples/temperature-measurement-app/esp32/partitions.csv b/examples/temperature-measurement-app/esp32/partitions.csv index b338ff11a11589..8b0928187b8708 100644 --- a/examples/temperature-measurement-app/esp32/partitions.csv +++ b/examples/temperature-measurement-app/esp32/partitions.csv @@ -1,6 +1,6 @@ # Name, Type, SubType, Offset, Size, Flags # Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap -nvs, data, nvs, , 0x6000, +nvs, data, nvs, , 0xC000, phy_init, data, phy, , 0x1000, # Factory partition size about 1.9MB -factory, app, factory, , 1945K, +factory, app, factory, , 1920K,