project-chip · mergify · May 12, 2025 · May 12, 2025 · May 12, 2025
diff --git a/docs/platforms/bouffalolab/getting_started.md b/docs/platforms/bouffalolab/getting_started.md
@@ -203,6 +203,27 @@ Taking lighting app with `littlefs` supported as example :
     > This BL706 + BL602 Wi-Fi solution: BL602 runs WLAN part and BL706 runs
     > TCP/IP stack which uses SPI for communication between these two parts.
 
+# Partition table
+
+`Bouffalo Lab` provides reference partition table files for each platform under
+`examples/platform/bouffalolab/<platforms>/flash_config`.
+
+Final products may have different flash layout requirements, such as:
+
+-   Firmware size requirements;
+-   Over-the-air upgrade support with or without compressed image;
+-   Supports more Matter fabrics;
+-   Custom application partitions;
+-   And other specific needs.
+
+Developers should design the flash layout accordingly for their final products.
+For guidance, refer to the ‌ flash tool documentation or contact `Bouffalo Lab`
+for support.
+
+> ‌**Note:**‌ The partition table is typically ‌not editable over-the-air.
+> Ensure sufficient margin in the initial design to accommodate future
+> requirements.
+
 # Download image
 
 Take build target `bouffalolab-bl602dk-light-wifi-littlefs` as example to

diff --git a/docs/platforms/bouffalolab/ota_upgrade.md b/docs/platforms/bouffalolab/ota_upgrade.md
@@ -36,8 +36,8 @@ OTA images will generated under
 -   `chip-bl602dk-lighting-example.bin.xz.hash.matter`, OTA image packed with
     compressed firmware image.
 
-BL616 SoC platform uses different OTA image format. Take BL616D lighting app
-with Wi-Fi and `littlefs` supported as example:
+BL616 SoC platform uses different OTA image format. Take BL616 lighting app with
+Wi-Fi and `littlefs` supported as example:
 
 -   `chip-bl616-lighting-example.bin.ota.matter`, OTA image packed with raw
     firmware image.

diff --git a/examples/platform/bouffalolab/bl602/flash_config/partition_cfg_4M.toml b/examples/platform/bouffalolab/bl602/flash_config/partition_cfg_4M.toml
@@ -41,7 +41,7 @@ type = 4
 name = "PSM"
 device = 0
 address0 = 0x3C3000
-size0 = 0x8000
+size0 = 0x10000
 address1 = 0
 size1 = 0
 # compressed image must set len,normal image can left it to 0

diff --git a/examples/platform/bouffalolab/bl616/flash_config/partition_cfg_4M.toml b/examples/platform/bouffalolab/bl616/flash_config/partition_cfg_4M.toml
@@ -25,9 +25,9 @@ type = 0
 name = "FW"
 device = 0
 address0 = 0x10000
-size0 = 0x200000
-address1 = 0x210000
-size1 = 0x168000
+size0 = 0x1FA000
+address1 = 0x20A000
+size1 = 0x164000
 # compressed image must set len,normal image can left it to 0
 len = 0
 # If header is 1, it will add the header.
@@ -39,8 +39,8 @@ security = 1
 type = 10
 name = "mfg"
 device = 0
-address0 = 0x210000
-size0 = 0x168000
+address0 = 0x20A000
+size0 = 0x164000
 address1 = 0
 size1 = 0
 # compressed image must set len,normal image can left it to 0
@@ -54,7 +54,7 @@ security = 1
 type = 2
 name = "media"
 device = 0
-address0 = 0x378000
+address0 = 0x36E000
 size0 = 0x71000
 address1 = 0
 size1 = 0
@@ -69,8 +69,8 @@ security = 0
 type = 3
 name = "PSM"
 device = 0
-address0 = 0x3E9000
-size0 = 0x8000
+address0 = 0x3DF000
+size0 = 0x10000
 address1 = 0
 size1 = 0
 # compressed image must set len,normal image can left it to 0
@@ -84,7 +84,7 @@ security = 0
 type = 4
 name = "KEY"
 device = 0
-address0 = 0x3F1000
+address0 = 0x3EF000
 size0 = 0x2000
 address1 = 0
 size1 = 0

diff --git a/examples/platform/bouffalolab/bl702/flash_config/partition_cfg_2M.toml b/examples/platform/bouffalolab/bl702/flash_config/partition_cfg_2M.toml
@@ -8,9 +8,9 @@ type = 0
 name = "FW"
 device = 0
 address0 = 0x10000
-size0 = 0x12A000
-address1 = 0x13A000
-size1 = 0xB8000
+size0 = 0x126000
+address1 = 0x136000
+size1 = 0xB4000
 # compressed image must set len,normal image can left it to 0
 len = 0
 activeindex = 0
@@ -20,8 +20,8 @@ age = 0
 type = 1
 name = "mfg"
 device = 0
-address0 = 0x13A000
-size0 = 0xB8000
+address0 = 0x136000
+size0 = 0xB4000
 address1 = 0
 size1 = 0
 # compressed image must set len,normal image can left it to 0
@@ -33,8 +33,8 @@ age = 0
 type = 2
 name = "PSM"
 device = 0
-address0 = 0x1F2000
-size0 = 0x8000
+address0 = 0x1EA000
+size0 = 0x10000
 address1 = 0
 size1 = 0
 # compressed image must set len,normal image can left it to 0

diff --git a/examples/platform/bouffalolab/bl702l/flash_config/partition_cfg_2M.toml b/examples/platform/bouffalolab/bl702l/flash_config/partition_cfg_2M.toml
@@ -8,9 +8,9 @@ type = 0
 name = "FW"
 device = 0
 address0 = 0x3000
-size0 = 0x12b000
-address1 = 0x12e000
-size1 = 0xC8000
+size0 = 0x123000
+address1 = 0x126000
+size1 = 0xC4000
 # compressed image must set len,normal image can left it to 0
 len = 0
 activeindex = 0
@@ -20,8 +20,8 @@ age = 0
 type = 1
 name = "mfg"
 device = 0
-address0 = 0x12A000
-size0 = 0xC8000
+address0 = 0x126000
+size0 = 0xC4000
 address1 = 0
 size1 = 0
 # compressed image must set len,normal image can left it to 0
@@ -33,8 +33,8 @@ age = 0
 type = 2
 name = "PSM"
 device = 0
-address0 = 0x1F2000
-size0 = 0x8000
+address0 = 0x1EA000
+size0 = 0x10000
 address1 = 0
 size1 = 0
 # compressed image must set len,normal image can left it to 0

diff --git a/src/platform/bouffalolab/common/ConnectivityManagerImpl.cpp b/src/platform/bouffalolab/common/ConnectivityManagerImpl.cpp
@@ -121,7 +121,9 @@ CHIP_ERROR ConnectivityManagerImpl::_SetWiFiStationMode(WiFiStationMode val)
 
     if (val != kWiFiStationMode_ApplicationControlled)
     {
+        chip::DeviceLayer::PlatformMgr().LockChipStack();
         DeviceLayer::SystemLayer().ScheduleWork(DriveStationState, NULL);
+        chip::DeviceLayer::PlatformMgr().UnlockChipStack();
     }
 
     if (mWiFiStationMode != val)