[Silabs] Update Gecko SDK to 4.3.2 (#29742)

project-chip · Dec 17, 2023 · 3562279 · 3562279
1 parent faff91a
commit 3562279
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 54 deletions.
diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -38,12 +38,12 @@ jobs:
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: ghcr.io/project-chip/chip-build-efr32:8
+      image: ghcr.io/project-chip/chip-build-efr32:19
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:
       - name: Checkout
-        uses: actions/checkout@v4        
+        uses: actions/checkout@v4
       - name: Checkout submodules & Bootstrap
         uses: ./.github/actions/checkout-submodules-and-bootstrap
         with:
@@ -58,9 +58,9 @@ jobs:
       - name: Test SLC gen
         timeout-minutes: 30
         run: |
-           scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs ./out/light-app BRD4187C --slc_generate --docker
-           scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs ./out/light-app BRD4164A --slc_generate --docker
-           rm -rf ./out/
+          scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs ./out/light-app BRD4187C --slc_generate --docker
+          scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs ./out/light-app BRD4164A --slc_generate --docker
+          rm -rf ./out/
       - name: Build some BRD4187C variants (1)
         run: |
           ./scripts/run_in_build_env.sh \

diff --git a/examples/platform/silabs/matter-platform.slcp b/examples/platform/silabs/matter-platform.slcp
@@ -94,6 +94,12 @@ configuration:
 - {name: SL_BOARD_ENABLE_VCOM, value: '0'}
 - {name: EMDRV_UARTDRV_FLOW_CONTROL_ENABLE, value: '0'}
 
+template_contribution:
+  - name: mbedtls_ssl_content_len_in_requirement
+    value: 900
+  - name: mbedtls_ssl_content_len_out_requirement
+    value: 900
+
 requires:
 - condition: [device_series_1]
   name: uartdrv_usart

diff --git a/third_party/silabs/BUILD.gn b/third_party/silabs/BUILD.gn
@@ -15,6 +15,7 @@
 import("//build_overrides/chip.gni")
 import("//build_overrides/efr32_sdk.gni")
 import("//build_overrides/jlink.gni")
+import("//build_overrides/openthread.gni")
 import("${chip_root}/src/platform/device.gni")
 import("${efr32_sdk_build_root}/silabs_board.gni")
 
@@ -54,16 +55,16 @@ group("efr32_sdk") {
 
 if (wifi_soc != true) {  # CCP board
   # Openthread GSDK libraries configurations
+
   if (use_silabs_thread_lib) {
     config("libopenthread-platform_config") {
-      include_dirs = [ "${sl_openthread_root}/examples/platforms" ]
+      include_dirs = [ "${openthread_root}/examples/platforms" ]
 
       defines = [ "SL_CONFIG_OPENTHREAD_LIB=1" ]
     }
 
     copy("copy_openthread_system") {
-      sources =
-          [ "${sl_openthread_root}/examples/platforms/openthread-system.h" ]
+      sources = [ "${openthread_root}/examples/platforms/openthread-system.h" ]
 
       outputs =
           [ "${root_gen_dir}/include/openthread/platform/{{source_file_part}}" ]
@@ -76,8 +77,7 @@ if (wifi_soc != true) {  # CCP board
     }
 
     source_set("libopenthread-platform") {
-      sources =
-          [ "${sl_openthread_root}/examples/platforms/openthread-system.h" ]
+      sources = [ "${openthread_root}/examples/platforms/openthread-system.h" ]
 
       public_deps = [ ":openthread_system" ]
 
@@ -97,7 +97,7 @@ if (wifi_soc != true) {  # CCP board
         "${chip_root}/examples/platform/silabs",
         "${sdk_support_root}/matter/efr32/${silabs_family}/${silabs_board}",
         "${sl_ot_efr32_root}",
-        "${sl_openthread_root}/src/",
+        "${openthread_root}/src/",
       ]
 
       # temporarily disable check until gsdk pulls in a more recent version
@@ -121,43 +121,43 @@ if (wifi_soc != true) {  # CCP board
     source_set("ot-efr32-cert") {
       if (enable_openthread_cli) {
         sources = [
-          "${sl_openthread_root}/examples/apps/cli/cli_uart.cpp",
-          "${sl_openthread_root}/src/cli/cli.cpp",
-          "${sl_openthread_root}/src/cli/cli.hpp",
-          "${sl_openthread_root}/src/cli/cli_bbr.cpp",
-          "${sl_openthread_root}/src/cli/cli_bbr.hpp",
-          "${sl_openthread_root}/src/cli/cli_br.cpp",
-          "${sl_openthread_root}/src/cli/cli_br.hpp",
-          "${sl_openthread_root}/src/cli/cli_coap.cpp",
-          "${sl_openthread_root}/src/cli/cli_coap.hpp",
-          "${sl_openthread_root}/src/cli/cli_coap_secure.cpp",
-          "${sl_openthread_root}/src/cli/cli_coap_secure.hpp",
-          "${sl_openthread_root}/src/cli/cli_commissioner.cpp",
-          "${sl_openthread_root}/src/cli/cli_commissioner.hpp",
-          "${sl_openthread_root}/src/cli/cli_config.h",
-          "${sl_openthread_root}/src/cli/cli_dataset.cpp",
-          "${sl_openthread_root}/src/cli/cli_dataset.hpp",
-          "${sl_openthread_root}/src/cli/cli_dns.cpp",
-          "${sl_openthread_root}/src/cli/cli_dns.hpp",
-          "${sl_openthread_root}/src/cli/cli_history.cpp",
-          "${sl_openthread_root}/src/cli/cli_history.hpp",
-          "${sl_openthread_root}/src/cli/cli_joiner.cpp",
-          "${sl_openthread_root}/src/cli/cli_joiner.hpp",
-          "${sl_openthread_root}/src/cli/cli_mac_filter.cpp",
-          "${sl_openthread_root}/src/cli/cli_mac_filter.hpp",
-          "${sl_openthread_root}/src/cli/cli_network_data.cpp",
-          "${sl_openthread_root}/src/cli/cli_network_data.hpp",
-          "${sl_openthread_root}/src/cli/cli_output.cpp",
-          "${sl_openthread_root}/src/cli/cli_output.hpp",
-          "${sl_openthread_root}/src/cli/cli_srp_client.cpp",
-          "${sl_openthread_root}/src/cli/cli_srp_client.hpp",
-          "${sl_openthread_root}/src/cli/cli_srp_server.cpp",
-          "${sl_openthread_root}/src/cli/cli_srp_server.hpp",
-          "${sl_openthread_root}/src/cli/cli_tcp.cpp",
-          "${sl_openthread_root}/src/cli/cli_tcp.hpp",
-          "${sl_openthread_root}/src/cli/cli_udp.cpp",
-          "${sl_openthread_root}/src/cli/cli_udp.hpp",
-          "${sl_openthread_root}/src/cli/x509_cert_key.hpp",
+          "${openthread_root}/examples/apps/cli/cli_uart.cpp",
+          "${openthread_root}/src/cli/cli.cpp",
+          "${openthread_root}/src/cli/cli.hpp",
+          "${openthread_root}/src/cli/cli_bbr.cpp",
+          "${openthread_root}/src/cli/cli_bbr.hpp",
+          "${openthread_root}/src/cli/cli_br.cpp",
+          "${openthread_root}/src/cli/cli_br.hpp",
+          "${openthread_root}/src/cli/cli_coap.cpp",
+          "${openthread_root}/src/cli/cli_coap.hpp",
+          "${openthread_root}/src/cli/cli_coap_secure.cpp",
+          "${openthread_root}/src/cli/cli_coap_secure.hpp",
+          "${openthread_root}/src/cli/cli_commissioner.cpp",
+          "${openthread_root}/src/cli/cli_commissioner.hpp",
+          "${openthread_root}/src/cli/cli_config.h",
+          "${openthread_root}/src/cli/cli_dataset.cpp",
+          "${openthread_root}/src/cli/cli_dataset.hpp",
+          "${openthread_root}/src/cli/cli_dns.cpp",
+          "${openthread_root}/src/cli/cli_dns.hpp",
+          "${openthread_root}/src/cli/cli_history.cpp",
+          "${openthread_root}/src/cli/cli_history.hpp",
+          "${openthread_root}/src/cli/cli_joiner.cpp",
+          "${openthread_root}/src/cli/cli_joiner.hpp",
+          "${openthread_root}/src/cli/cli_mac_filter.cpp",
+          "${openthread_root}/src/cli/cli_mac_filter.hpp",
+          "${openthread_root}/src/cli/cli_network_data.cpp",
+          "${openthread_root}/src/cli/cli_network_data.hpp",
+          "${openthread_root}/src/cli/cli_output.cpp",
+          "${openthread_root}/src/cli/cli_output.hpp",
+          "${openthread_root}/src/cli/cli_srp_client.cpp",
+          "${openthread_root}/src/cli/cli_srp_client.hpp",
+          "${openthread_root}/src/cli/cli_srp_server.cpp",
+          "${openthread_root}/src/cli/cli_srp_server.hpp",
+          "${openthread_root}/src/cli/cli_tcp.cpp",
+          "${openthread_root}/src/cli/cli_tcp.hpp",
+          "${openthread_root}/src/cli/cli_udp.cpp",
+          "${openthread_root}/src/cli/cli_udp.hpp",
+          "${openthread_root}/src/cli/x509_cert_key.hpp",
         ]
       }
 
@@ -169,9 +169,9 @@ if (wifi_soc != true) {  # CCP board
       public_deps = [
         ":libopenthread-platform",
         ":openthread_core_config_efr32",
+        "${openthread_root}/include/openthread:openthread",
+        "${openthread_root}/src/core/:libopenthread_core_headers",
         "${segger_rtt_root}:segger_rtt",
-        "${sl_openthread_root}/include/openthread:openthread",
-        "${sl_openthread_root}/src/core/:libopenthread_core_headers",
       ]
 
       deps = [ "${efr32_sdk_build_root}:efr32_sdk" ]
@@ -188,7 +188,7 @@ if (wifi_soc != true) {  # CCP board
         COAP_API = "coap_"
       }
 
-      public_configs += [ "${sl_openthread_root}:openthread_${XTD}_config" ]
+      public_configs += [ "${openthread_root}:openthread_${XTD}_config" ]
 
       libs = [
         "${sl_ot_libs_path}/libs/libsl_ot_stack_${XTD}_${COAP_API}${silabs_family}_gcc.a",

diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni
@@ -79,7 +79,6 @@ declare_args() {
   sl_ot_libs_path = "${efr32_sdk_root}/protocol/openthread"
   sl_ot_platform_abstraction =
       "${efr32_sdk_root}/protocol/openthread/platform-abstraction"
-  sl_openthread_root = "${efr32_sdk_root}/util/third_party/openthread"
 
   # board related pre-generated files path (default)
   sl_pre_gen_path =
@@ -271,6 +270,13 @@ template("efr32_sdk") {
       #"__STACK_SIZE=0",
     ]
 
+    if (!(use_silabs_thread_lib || use_silabs_thread_lib)) {
+      #Enabling this config temporarly to fix a build issue until
+      #official fix is pushed
+
+      defines += [ "OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE=1" ]
+    }
+
     # Temporary configuration to enable COAP specific configurations
     if (use_thread_coap_lib) {
       defines += [ "SL_USE_COAP_CONFIG=1" ]

diff --git a/third_party/silabs/gecko_sdk b/third_party/silabs/gecko_sdk
diff --git a/third_party/silabs/matter_support b/third_party/silabs/matter_support