[Bouffalo Lab] Add/update Bouffalo platform SDK repo (project-chip#43273) (#10)

* [Bouffalo Lab] Add/update Bouffalo platform SDK repo (project-chip#43273)

* [Bouffalo Lab] Add BouffaloSDK for bl616

* update to use psram cachable address

* [Bouffalo Lab] Re-assign memory address of matter platform task for BL702 (#7)

* [Bouffalo Lab] update bl702l compile script for thread commissioning (#8)

* fix get thread network interface in DiagnosticDataProviderImpl

* update sdk

* fix compile error after merge with latest code

* update as gemini-code-assist suggested

* Restyled by whitespace

* Restyled by clang-format

* Restyled by gn

* Restyled by ruff

* Restyled by autopep8

* Restyled by clang-format

* fix targets test data

* Restyled by clang-format

* Restyled by prettier-markdown

* resume workflows in a single job

* Exclude Bouffalo SDK from run-clang-tidy-on-compile-commands.py execution in build.yaml.

* recover build.yaml

* remove bouffalo sdk repo

* clone bouffalo sdk to path third_party/bouffalolab/repo_bouffalo_sdk

* update bouffalolab workflows build jobs

---------

Co-authored-by: Restyled.io <commits@restyled.io>

* Restyled by clang-format

* Restyled by ruff

---------

Co-authored-by: Restyled.io <commits@restyled.io>

Author: wy-hh

.github/workflows/examples-bouffalolab.yaml

@@ -25,6 +25,7 @@ on:
 
 concurrency:
   group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
+
   cancel-in-progress: true
 
 env:
@@ -54,85 +55,99 @@ jobs:
         if: ${{ !env.ACT }}
         with:
           gh-context: ${{ toJson(github) }}
+
       - name: Build example BL602 Lighting App
         run: |
           ./scripts/run_in_build_env.sh \
-            "./scripts/build/build_examples.py \
-              --target bouffalolab-bl602dk-light-wifi-littlefs-mfd-rpc \
-              build \
-              --copy-artifacts-to out/artifacts \
-            "
-      - name: Prepare some bloat report from the previous builds
-        run: |
+            "./scripts/build/build_examples.py --target bouffalolab-bl602dk-light-wifi-littlefs-mfd-rpc build"
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
               bl602 bl602+mfd+littlefs+rpc lighting-app \
-              out/artifacts/bouffalolab-bl602dk-light-wifi-littlefs-mfd-rpc/chip-bl602-lighting-example.out \
+              out/bouffalolab-bl602dk-light-wifi-littlefs-mfd-rpc/chip-bl602-lighting-example.out \
               /tmp/bloat_reports/
-      - name: Clean out build output
-        run: rm -rf ./out
+          rm -rf ./out
 
-      - name: Build example BL702 Lighting App
+      - name: Build example BL702 Lighting App (Ethernet)
+        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'bouffalolab/bflb-connectedhomeip'
         run: |
           ./scripts/run_in_build_env.sh \
-            "./scripts/build/build_examples.py \
-              --target bouffalolab-bl706dk-light-ethernet-easyflash \
-              --target bouffalolab-bl706dk-light-wifi-littlefs \
-              --target bouffalolab-bl706dk-light-thread-littlefs-mfd-rpc \
-              build \
-              --copy-artifacts-to out/artifacts \
-            "
-      - name: Prepare some bloat report from the previous builds
-        run: |
+            "./scripts/build/build_examples.py --target bouffalolab-bl706dk-light-ethernet-easyflash build "
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
               bl702 bl702+eth lighting-app \
-              out/artifacts/bouffalolab-bl706dk-light-ethernet-easyflash/chip-bl702-lighting-example.out \
+              out/bouffalolab-bl706dk-light-ethernet-easyflash/chip-bl702-lighting-example.out \
               /tmp/bloat_reports/
+          rm -rf ./out
+
+      - name: Build example BL702 Lighting App (Wi-Fi)
+        run: |
+          ./scripts/run_in_build_env.sh \
+            "./scripts/build/build_examples.py --target bouffalolab-bl706dk-light-wifi-littlefs-shell build "
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-              bl702 bl702+wifi lighting-app \
-              out/artifacts/bouffalolab-bl706dk-light-wifi-littlefs/chip-bl702-lighting-example.out \
+              bl702 bl702+eth lighting-app \
+              out/bouffalolab-bl706dk-light-wifi-littlefs-shell/chip-bl702-lighting-example.out \
               /tmp/bloat_reports/
+          rm -rf ./out
+
+      - name: Build example BL702 Lighting App (Thread)
+        run: |
+          ./scripts/run_in_build_env.sh \
+            "./scripts/build/build_examples.py --target bouffalolab-bl706dk-light-thread-littlefs-mfd-rpc build "
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-              bl702 bl706+mfd+rpc+littlefs lighting-app \
-              out/artifacts/bouffalolab-bl706dk-light-thread-littlefs-mfd-rpc/chip-bl702-lighting-example.out \
+              bl702 bl702+eth lighting-app \
+              out/bouffalolab-bl706dk-light-thread-littlefs-mfd-rpc/chip-bl702-lighting-example.out \
               /tmp/bloat_reports/
-      - name: Clean out build output
-        run: rm -rf ./out
+          rm -rf ./out
 
       - name: Build example BL702L Lighting App
-        timeout-minutes: 30
+        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'bouffalolab/bflb-connectedhomeip'
         run: |
           ./scripts/run_in_build_env.sh \
-            "./scripts/build/build_examples.py \
-              --target bouffalolab-bl704ldk-light-thread-littlefs-mfd \
-              build \
-              --copy-artifacts-to out/artifacts \
-            "
-      - name: Prepare some bloat report from the previous builds
-        run: |
+            "./scripts/build/build_examples.py --target bouffalolab-bl704ldk-light-thread-littlefs-mfd build "
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
               bl702l bl702l+mfd+littlefs lighting-app \
-              out/artifacts/bouffalolab-bl704ldk-light-thread-littlefs-mfd/chip-bl702l-lighting-example.out \
+              out/bouffalolab-bl704ldk-light-thread-littlefs-mfd/chip-bl702l-lighting-example.out \
               /tmp/bloat_reports/
-      - name: Clean out build output
-        run: rm -rf ./out
+          rm -rf ./out
 
       - name: Build example BL702L Contact Sensor
-        timeout-minutes: 30
         run: |
           ./scripts/run_in_build_env.sh \
-            "./scripts/build/build_examples.py \
-              --target bouffalolab-bl704ldk-contact-sensor-thread-mtd-littlefs-mfd \
-              build \
-              --copy-artifacts-to out/artifacts \
-            "
-      - name: Prepare some bloat report from the previous builds
-        run: |
+            "./scripts/build/build_examples.py --target bouffalolab-bl704ldk-contact-sensor-thread-mtd-littlefs-mfd build"
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
               bl702l bl702l+mfd+littlefs contact-sensor-app \
-              out/artifacts/bouffalolab-bl704ldk-contact-sensor-thread-mtd-littlefs-mfd/chip-bl702l-contact-sensor-example.out \
+              out/bouffalolab-bl704ldk-contact-sensor-thread-mtd-littlefs-mfd/chip-bl702l-contact-sensor-example.out \
+              /tmp/bloat_reports/
+          rm -rf ./out
+
+      - name: Build example BL616 Lighting App (Ethernet)
+        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'bouffalolab/bflb-connectedhomeip'
+        run: |
+          ./scripts/run_in_build_env.sh \
+            "./scripts/build/build_examples.py --target bouffalolab-bl616dk-light-ethernet-littlefs-mfd build "
+          .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+              bl616 bl616+ethernet lighting-app \
+              out/bouffalolab-bl616dk-light-ethernet-littlefs-mfd/chip-bl616-lighting-example.out \
+              /tmp/bloat_reports/
+          rm -rf ./out
+
+      - name: Build example BL616 Lighting App (Wi-Fi)
+        run: |
+          ./scripts/run_in_build_env.sh \
+            "./scripts/build/build_examples.py --target bouffalolab-bl616dk-light-wifi-littlefs-mfd-shell build"
+          .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+              bl616 bl616+wifi+shell lighting-app \
+              out/bouffalolab-bl616dk-light-wifi-littlefs-mfd-shell/chip-bl616-lighting-example.out \
+              /tmp/bloat_reports/
+          rm -rf ./out
+
+      - name: Build example BL616 Lighting App (Thread)
+        run: |
+          ./scripts/run_in_build_env.sh \
+            "./scripts/build/build_examples.py --target bouffalolab-bl616dk-light-thread-littlefs-mfd build"
+          .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+              bl616 bl616+thread lighting-app \
+              out/bouffalolab-bl616dk-light-thread-littlefs-mfd/chip-bl616-lighting-example.out \
               /tmp/bloat_reports/
-      - name: Clean out build output
-        run: rm -rf ./out
+          rm -rf ./out
 
       - name: Uploading Size Reports
         uses: ./.github/actions/upload-size-reports

.gitmodules

@@ -226,6 +226,7 @@
 	url = https://github.com/bouffalolab/bl_iot_sdk_tiny.git
 	branch = main
 	platforms = bouffalolab
+	recursive = true
 [submodule "third_party/libwebsockets/repo"]
 	path = third_party/libwebsockets/repo
 	url = https://github.com/warmcat/libwebsockets
@@ -334,3 +335,8 @@
 	url = https://github.com/awslabs/amazon-kinesis-video-streams-webrtc-sdk-c
 	platforms = esp32
 	recursive = true
+[submodule "third_party/bouffalolab/repo_bouffalo_sdk"]
+	path = third_party/bouffalolab/repo_bouffalo_sdk
+	url = https://github.com/bouffalolab/bouffalo_sdk.git
+	branch = main
+	platforms = bouffalolab

docs/platforms/bouffalolab/getting_started.md

@@ -92,7 +92,7 @@ following command to list supports options.
 The output with `bouffalolab` started likes below:
 
 ```
-bouffalolab-{bl602dk,bl704ldk,bl706dk,bl602-night-light,bl706-night-light,bl602-iot-matter-v1,xt-zb6-devkit}-{light,contact-sensor}-{ethernet,wifi,thread,thread-ftd,thread-mtd}-{easyflash,littlefs}[-shell][-mfd][-rotating_device_id][-rpc][-cdc]
+bouffalolab-{bl602-night-light,bl602dk,bl616dk,bl704ldk,bl706-night-light,bl706dk}-{contact-sensor,light}-{ethernet,thread,thread-ftd,thread-mtd,wifi}-{easyflash,littlefs}[-cdc][-coredump][-memmonitor][-mfd][-mot][-rotating_device_id][-rpc][-shell]
 ```
 
 -   supported board options, select one of the following options to build
@@ -104,8 +104,6 @@ bouffalolab-{bl602dk,bl704ldk,bl706dk,bl602-night-light,bl706-night-light,bl602-
 
     -   `-bl602-night-light`
     -   `-bl706-night-light`
-    -   `-bl602-iot-matter-v1`
-    -   `-xt-zb6-devkit`
 
 -   supported example options, select one of the following options to build
 
@@ -131,8 +129,9 @@ bouffalolab-{bl602dk,bl704ldk,bl706dk,bl602-night-light,bl706-night-light,bl602-
 
     -   `-easyflash`, specifies to use `easyflash` for flash access.
 
-        > `littlefs` has different format with `easyflash`, please uses
-        > `-easyflash` for your in-field production
+        > `littlefs` uses a different format than `easyflash` and they are not
+        > compatible. Please use the `-easyflash` flag if existing in-field
+        > devices were already deployed with `easyflash`.
 
 -   `-rotating_device_id`, enable rotating device id
 
@@ -170,6 +169,15 @@ Taking lighting app with `littlefs` supported as example :
     ./scripts/build/build_examples.py --target bouffalolab-bl616dk-light-wifi-littlefs build
     ```
 
+-   BL706 with Wi-Fi
+
+    ```
+    ./scripts/build/build_examples.py --target bouffalolab-bl706dk-light-ethernet-littlefs build
+    ```
+
+    > 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.
+
 -   BL616 with Thread
 
     ```
@@ -194,15 +202,12 @@ Taking lighting app with `littlefs` supported as example :
     ./scripts/build/build_examples.py --target bouffalolab-bl706dk-light-ethernet-littlefs build
     ```
 
--   BL706 with Wi-Fi
+-   BL616 with Ethernet
 
     ```
-    ./scripts/build/build_examples.py --target bouffalolab-bl706dk-light-ethernet-littlefs build
+    ./scripts/build/build_examples.py --target bouffalolab-bl616dk-light-ethernet-littlefs build
     ```
 
-    > 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/contact-sensor-app/bouffalolab/bl702l/app_pds.cpp

@@ -95,8 +95,6 @@ void app_pds_fastboot_done_callback(void)
 
     bl_psram_init();
 
-    // app_pds_config_pin();
-
     app_pds_wakeup_source = bl_pds_get_wakeup_source();
     app_pds_wakeup_pin    = bl_pds_get_wakeup_gpio();
 }
@@ -107,6 +105,7 @@ int app_pds_before_sleep_callback(void)
     {
         bl_pds_set_psram_retention(1);
         lmac154_sleepStoreRegs(low_power_pds_lmac154_backup);
+        L1C_Cache_Flush();
 
         return 0;
     }
@@ -125,6 +124,7 @@ void app_pds_after_sleep_callback(void)
 
         zb_timer_restore_events(true);
 
+        lmac154_enableCoex();
         bl_irq_enable(M154_IRQn);
     }
     bl_sec_init();

examples/contact-sensor-app/bouffalolab/bl702l/args.gni

@@ -21,7 +21,7 @@ bl_iot_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 
 chip_detail_logging = false
 is_debug = false
-chip_progress_logging = true
+chip_progress_logging = false
 chip_error_logging = true
 
 chip_enable_icd_server = true

examples/contact-sensor-app/bouffalolab/common/AppTask.cpp

@@ -73,7 +73,7 @@ void AppTask::AppShellTask(void * args)
     Shell::Engine::Root().RunMainLoop();
 }
 
-CHIP_ERROR AppTask::StartAppShellTask()
+void AppTask::StartAppShellTask()
 {
     static TaskHandle_t shellTask;
 
@@ -82,8 +82,6 @@ CHIP_ERROR AppTask::StartAppShellTask()
     cmd_misc_init();
 
     xTaskCreate(AppTask::AppShellTask, "chip_shell", 1024 / sizeof(configSTACK_DEPTH_TYPE), NULL, APP_TASK_PRIORITY, &shellTask);
-
-    return CHIP_NO_ERROR;
 }
 #endif
 

examples/contact-sensor-app/bouffalolab/common/AppTask.h

@@ -107,7 +107,7 @@ class AppTask
     static void AppTaskMain(void * pvParameter);
 
 #if CONFIG_ENABLE_CHIP_SHELL
-    static CHIP_ERROR StartAppShellTask();
+    static void StartAppShellTask();
     static void AppShellTask(void * args);
 #endif
 

examples/lighting-app/bouffalolab/bl602/BUILD.gn

@@ -109,10 +109,6 @@ bouffalolab_executable("lighting_app") {
   defines +=
       [ "CONFIG_BOUFFALOLAB_FACTORY_DATA_ENABLE=${chip_enable_factory_data}" ]
 
-  if (enable_lwip_pbuf_ram) {
-    defines += [ "CHIP_SYSTEM_CONFIG_PACKETBUFFER_LWIP_PBUF_RAM=1" ]
-  }
-
   bl_plat_name = "bl602"
   sources = [
     "${examples_plat_dir}/common/route_hook/bl_route_hook.c",
@@ -232,10 +228,6 @@ bouffalolab_executable("lighting_app") {
   inputs = [ ldscript ]
 
   if (chip_print_memory_usage) {
-    if (enable_lwip_pbuf_ram) {
-      ldflags += [ "-Wl,--defsym=__RAM_PBUF_POOL=0" ]
-    }
-
     ldflags += [
       "-Wl,--print-memory-usage",
       "-fstack-usage",

examples/lighting-app/bouffalolab/bl616/BUILD.gn

@@ -54,6 +54,10 @@ declare_args() {
   board = "BL616DK"
   module_type = "BL616"
   baudrate = 2000000
+
+  app_ver_x = 2
+  app_ver_y = 1
+  app_ver_z = 0
 }
 
 bouffalo_sdk("sdk") {
@@ -72,8 +76,18 @@ bouffalo_sdk("sdk") {
     "OTA_PERIODIC_TIMEOUT=${ota_periodic_query_timeout_seconds}",
     "OTA_AUTO_REBOOT_DELAY=${ota_auto_reboot_delay_seconds}",
     "CHIP_UART_BAUDRATE=${baudrate}",
+    "APP_VER_X=${app_ver_x}",
+    "APP_VER_Y=${app_ver_y}",
+    "APP_VER_Z=${app_ver_z}",
   ]
 
+  if (chip_enable_ethernet) {
+    include_dirs += [ "${example_dir}/bl616/ethernet" ]
+  } else if (chip_enable_wifi) {
+    include_dirs += [ "${example_dir}/bl616/wifi" ]
+  }
+  defines += [ "CHIP_DEVICE_CONFIG_ENABLE_ETHERNET=${chip_enable_ethernet}" ]
+
   defines += [ "PW_RPC_ENABLED=${chip_enable_pw_rpc}" ]
   if (chip_enable_pw_rpc) {
     include_dirs += [ "${examples_plat_dir}/common/rpc" ]
@@ -121,12 +135,7 @@ bouffalolab_executable("lighting_app") {
     defines += [ "BOOT_PIN_RESET=2" ]
   }
 
-  if (enable_lwip_pbuf_ram) {
-    defines += [ "CHIP_SYSTEM_CONFIG_PACKETBUFFER_LWIP_PBUF_RAM=1" ]
-  }
-
   defines += [ "BL616DK" ]
-
   sources = [
     "${chip_root}/examples/providers/DeviceInfoProviderImpl.cpp",
     "${example_dir}/common/AppTask.cpp",

examples/lighting-app/bouffalolab/bl616/FreeRTOSConfig.h

@@ -103,10 +103,6 @@ to exclude the API function. */
 #define INCLUDE_xTaskGetHandle 1
 #define INCLUDE_xSemaphoreGetMutexHolder 1
 
-/* Normal assert() semantics without relying on the provision of an assert.h
-header file. */
-void vApplicationMallocFailedHook(void);
-
 #if __cplusplus
 extern "C" void vAssertCalled(void);
 #else