[Silabs] Bump Simplicity SDK to 2024.6.2 (#36213) (#36222)

Author: mkardous-silabs

.github/workflows/examples-efr32.yaml

@@ -41,7 +41,7 @@ jobs:
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: ghcr.io/project-chip/chip-build-efr32:84
+      image: ghcr.io/project-chip/chip-build-efr32:85
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:

.github/workflows/release_artifacts.yaml

@@ -64,7 +64,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-efr32:84
+            image: ghcr.io/project-chip/chip-build-efr32:85
         steps:
             - name: Checkout
               uses: actions/checkout@v4

.gitmodules

@@ -213,7 +213,7 @@
 [submodule "third_party/silabs/simplicity_sdk"]
 	path = third_party/silabs/simplicity_sdk
 	url = https://github.com/SiliconLabs/simplicity_sdk.git
-	branch = v2024.6.1-0
+	branch = v2024.6.2
 	platforms = silabs
 [submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"]
 	path = third_party/silabs/wiseconnect-wifi-bt-sdk

integrations/cloudbuild/smoke-test.yaml

@@ -1,13 +1,13 @@
 steps:
-    - name: "ghcr.io/project-chip/chip-build-vscode:84"
+    - name: "ghcr.io/project-chip/chip-build-vscode:85"
       entrypoint: "bash"
       args:
           - "-c"
           - |
               git config --global --add safe.directory "*"
               python scripts/checkout_submodules.py --shallow --recursive --platform esp32 nrfconnect silabs linux android 
       id: Submodules
-    - name: "ghcr.io/project-chip/chip-build-vscode:84"
+    - name: "ghcr.io/project-chip/chip-build-vscode:85"
       # NOTE: silabs boostrap is NOT done with the rest as it requests a conflicting
       #       jinja2 version (asks for 3.1.3 when constraints.txt asks for 3.0.3)
       env:
@@ -24,7 +24,7 @@ steps:
             path: /pwenv
       timeout: 900s
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:84"
+    - name: "ghcr.io/project-chip/chip-build-vscode:85"
       id: ESP32
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -45,7 +45,7 @@ steps:
       volumes:
           - name: pwenv
             path: /pwenv
-    - name: "ghcr.io/project-chip/chip-build-vscode:84"
+    - name: "ghcr.io/project-chip/chip-build-vscode:85"
       id: NRFConnect
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -66,7 +66,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:84"
+    - name: "ghcr.io/project-chip/chip-build-vscode:85"
       id: EFR32
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -88,7 +88,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:84"
+    - name: "ghcr.io/project-chip/chip-build-vscode:85"
       id: Linux
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -141,7 +141,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:84"
+    - name: "ghcr.io/project-chip/chip-build-vscode:85"
       id: Android
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv

third_party/openthread/platforms/efr32/BUILD.gn

@@ -65,14 +65,16 @@ source_set("libopenthread-efr32") {
     "${sl_ot_efr32_root}/flash.c",
     "${sl_ot_efr32_root}/ieee802154-packet-utils.cpp",
     "${sl_ot_efr32_root}/misc.c",
-    "${sl_ot_efr32_root}/radio.c",
     "${sl_ot_efr32_root}/radio_coex.c",
     "${sl_ot_efr32_root}/radio_extension.c",
     "${sl_ot_efr32_root}/radio_power_manager.c",
     "${sl_ot_efr32_root}/sl_gp_interface.c",
     "${sl_ot_efr32_root}/sleep.c",
     "${sl_ot_efr32_root}/soft_source_match_table.c",
     "${sl_ot_efr32_root}/system.c",
+
+    # Temporary file until the files in the SI SDK is fixed
+    "${sdk_support_root}/protocol/openthread/platform-abstraction/efr32/radio.c",
   ]
 
   include_dirs = [ "${openthread_root}/examples/platforms/utils" ]

third_party/silabs/BUILD.gn

@@ -206,7 +206,9 @@ if (wifi_soc != true) {  # CCP board
           "${openthread_root}/src/core/mac/mac_frame.cpp",
           "${openthread_root}/src/core/mac/sub_mac.cpp",
           "${openthread_root}/src/core/thread/mle.cpp",
-          "${sl_ot_platform_abstraction}/efr32/radio.c",
+
+          # Temporary file until the files in the SI SDK is fixed
+          "${sdk_support_root}/protocol/openthread/platform-abstraction/efr32/radio.c",
         ]
 
         include_dirs = [ "${sl_ot_platform_abstraction}/include" ]

third_party/silabs/lwip.gni

@@ -169,10 +169,8 @@ template("lwip_target") {
         "${_lwip_root}/src/core/ipv6/ip6.c",
         "${_lwip_root}/src/core/ipv6/ip6_addr.c",
         "${_lwip_root}/src/core/ipv6/ip6_frag.c",
+        "${_lwip_root}/src/core/ipv6/mld6.c",
         "${_lwip_root}/src/core/ipv6/nd6.c",
-
-        # TODO: When updating to next Si SDK version, revert change.
-        "${sdk_support_root}/src/core/ipv6/mld6.c",
       ]
     }