Merge branch 'master' of https://github.com/project-chip/connectedhomeip

into 14542_changes # Conflicts: # src/app/tests/suites/certification/Test_TC_CGEN_2_1.yaml # third_party/efr32_sdk/repo # zzz_generated/chip-tool/zap-generated/test/Commands.h # zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
project-chip · Jun 22, 2022 · 93231e7 · 93231e7
2 parents 4fb736a + 6231ccc
commit 93231e7
Show file tree

Hide file tree

Showing 31 changed files with 20,580 additions and 21,959 deletions.
diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -15,102 +15,121 @@
 name: Build example - EFR32
 
 on:
-    push:
-    pull_request:
+  push:
+  pull_request:
 
 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
+  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
 
 jobs:
-    efr32:
-        name: EFR32
-        timeout-minutes: 60
+  efr32:
+    name: EFR32
+    timeout-minutes: 60
 
-        env:
-            EFR32_BOARD: BRD4161A
-            BUILD_TYPE: gn_efr32
+    env:
+      EFR32_BOARD: BRD4161A
+      BUILD_TYPE: gn_efr32
+
+    runs-on: ubuntu-latest
+    if: github.actor != 'restyled-io[bot]'
+
+    container:
+      image: connectedhomeip/chip-build-efr32:0.5.79
+      volumes:
+        - "/tmp/bloat_reports:/tmp/bloat_reports"
+    steps:
+      - uses: Wandalen/[email protected]
+        name: Checkout
+        with:
+          action: actions/checkout@v3
+          with: |
+            token: ${{ github.token }}
+          attempt_limit: 3
+          attempt_delay: 2000
+      - name: Checkout submodules
+        run: scripts/checkout_submodules.py --shallow --platform efr32
 
-        runs-on: ubuntu-latest
-        if: github.actor != 'restyled-io[bot]'
+      - name: Install git-lfs # Temporary measure untill docker container is updated
+        run:
+          "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash; \
+          apt-get install git-lfs; \
+          git lfs install;"
 
-        container:
-            image: connectedhomeip/chip-build-efr32:0.5.79
-            volumes:
-                - "/tmp/bloat_reports:/tmp/bloat_reports"
-        steps:
-            - uses: Wandalen/[email protected]
-              name: Checkout
-              with:
-                  action: actions/checkout@v3
-                  with: |
-                      token: ${{ github.token }}
-                  attempt_limit: 3
-                  attempt_delay: 2000
-            - name: Checkout submodules
-              run: scripts/checkout_submodules.py --shallow --platform efr32
+      - name: Create LFS file hash list
+        run: git -C third_party/silabs/gecko_sdk lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id
 
-            - name: Set up environment for size reports
-              if: ${{ !env.ACT }}
-              env:
-                  GH_CONTEXT: ${{ toJson(github) }}
-              run: scripts/tools/memory/gh_sizes_environment.py "${GH_CONTEXT}"
+      - name: Restore gecko_sdk LFS cache
+        uses: actions/cache@v2
+        id: lfs-cache
+        with:
+          path: .git/modules/third_party/silabs/gecko_sdk/lfs
+          key: lfs-${{ hashFiles('.lfs-assets-id') }}
+
+      - name: Git LFS Pull
+        run: git -C third_party/silabs/gecko_sdk lfs pull
+
+      - name: Set up environment for size reports
+        if: ${{ !env.ACT }}
+        env:
+          GH_CONTEXT: ${{ toJson(github) }}
+        run: scripts/tools/memory/gh_sizes_environment.py "${GH_CONTEXT}"
 
-            - name: Bootstrap
-              timeout-minutes: 25
-              run: scripts/build/gn_bootstrap.sh
-            - name: Uploading bootstrap logs
-              uses: actions/upload-artifact@v2
-              if: ${{ always() }} && ${{ !env.ACT }}
-              with:
-                  name: bootstrap-logs
-                  path: |
-                      .environment/gn_out/.ninja_log
-                      .environment/pigweed-venv/*.log
+      - name: Bootstrap
+        timeout-minutes: 25
+        run: scripts/build/gn_bootstrap.sh
+      - name: Uploading bootstrap logs
+        uses: actions/upload-artifact@v2
+        if: ${{ always() }} && ${{ !env.ACT }}
+        with:
+          name: bootstrap-logs
+          path: |
+            .environment/gn_out/.ninja_log
+            .environment/pigweed-venv/*.log
 
-            - name: Build some BRD4161A variants
-              timeout-minutes: 50
-              run: |
-                  ./scripts/run_in_build_env.sh \
-                     "./scripts/build/build_examples.py \
-                        --enable-flashbundle \
-                        --target-glob '*-brd4161a-{lock,light,switch,window-covering,unit-test}' \
-                        build \
-                        --copy-artifacts-to out/artifacts \
-                     "
-            - name: Prepare some bloat report from the previous builds
-              run: |
-                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                     efr32 BRD4161A lighting-app \
-                     out/efr32-brd4161a-light/chip-efr32-lighting-example.out \
-                     /tmp/bloat_reports/
-                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py  \
-                     efr32 BRD4161A window-app \
-                     out/efr32-brd4161a-window-covering/chip-efr32-window-example.out \
-                     /tmp/bloat_reports/
-            - name: Build example EFR32 Lighting App for BRD4161A with RPCs
-              timeout-minutes: 10
-              run: |
-                  scripts/examples/gn_efr32_example.sh examples/lighting-app/efr32/ out/lighting_app_debug_rpc BRD4161A \
-                    'import("//with_pw_rpc.gni")'
-                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+rpc lighting-app \
-                    out/lighting_app_debug_rpc/BRD4161A/chip-efr32-lighting-example.out /tmp/bloat_reports/
-            - name: Build example EFR32+WF200 WiFi Lock app for BRD4161A
-              timeout-minutes: 10
-              run: |
-                  scripts/examples/gn_efr32_example.sh examples/lock-app/efr32/ out/lock_app_wifi_wf200 BRD4161A is_debug=false --wifi wf200
-                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+wf200 lock-app \
-                    out/lock_app_wifi_wf200/BRD4161A/chip-efr32-lock-example.out /tmp/bloat_reports/
-            - name: Build example EFR32+RS911x WiFi Lighting app for BRD4161A
-              timeout-minutes: 10
-              run: |
-                  scripts/examples/gn_efr32_example.sh examples/lighting-app/efr32/ out/lighting_app_wifi_rs911x BRD4161A --wifi rs911x
-                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+rs911x lighting-app \
-                    out/lighting_app_wifi_rs911x/BRD4161A/chip-efr32-lighting-example.out /tmp/bloat_reports/
-            - name: Uploading Size Reports
-              uses: actions/upload-artifact@v2
-              if: ${{ !env.ACT }}
-              with:
-                  name: Size,EFR32-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
-                  path: |
-                      /tmp/bloat_reports/
+      - name: Build some BRD4161A variants
+        timeout-minutes: 50
+        run: |
+          ./scripts/run_in_build_env.sh \
+             "./scripts/build/build_examples.py \
+                --enable-flashbundle \
+                --target-glob '*-brd4161a-{lock,light,switch,window-covering,unit-test}' \
+                build \
+                --copy-artifacts-to out/artifacts \
+             "
+      - name: Prepare some bloat report from the previous builds
+        run: |
+          .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+             efr32 BRD4161A lighting-app \
+             out/efr32-brd4161a-light/chip-efr32-lighting-example.out \
+             /tmp/bloat_reports/
+          .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py  \
+             efr32 BRD4161A window-app \
+             out/efr32-brd4161a-window-covering/chip-efr32-window-example.out \
+             /tmp/bloat_reports/
+      - name: Build example EFR32 Lighting App for BRD4161A with RPCs
+        timeout-minutes: 10
+        run: |
+          scripts/examples/gn_efr32_example.sh examples/lighting-app/efr32/ out/lighting_app_debug_rpc BRD4161A \
+            'import("//with_pw_rpc.gni")'
+          .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+rpc lighting-app \
+            out/lighting_app_debug_rpc/BRD4161A/chip-efr32-lighting-example.out /tmp/bloat_reports/
+      - name: Build example EFR32+WF200 WiFi Lock app for BRD4161A
+        timeout-minutes: 10
+        run: |
+          scripts/examples/gn_efr32_example.sh examples/lock-app/efr32/ out/lock_app_wifi_wf200 BRD4161A is_debug=false --wifi wf200
+          .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+wf200 lock-app \
+            out/lock_app_wifi_wf200/BRD4161A/chip-efr32-lock-example.out /tmp/bloat_reports/
+      - name: Build example EFR32+RS911x WiFi Lighting app for BRD4161A
+        timeout-minutes: 10
+        run: |
+          scripts/examples/gn_efr32_example.sh examples/lighting-app/efr32/ out/lighting_app_wifi_rs911x BRD4161A --wifi rs911x
+          .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+rs911x lighting-app \
+            out/lighting_app_wifi_rs911x/BRD4161A/chip-efr32-lighting-example.out /tmp/bloat_reports/
+      - name: Uploading Size Reports
+        uses: actions/upload-artifact@v2
+        if: ${{ !env.ACT }}
+        with:
+          name: Size,EFR32-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
+          path: |
+            /tmp/bloat_reports/
diff --git a/.gitmodules b/.gitmodules
@@ -63,11 +63,6 @@
 	url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git
 	branch  = V10.3.1-kernel-only
 	platforms = ameba,cc13x2_26x2,bl602,efr32,esp32,k32w0,p6,qpg
-[submodule "efr32_sdk"]
-	path = third_party/efr32_sdk/repo
-	url = https://github.com/SiliconLabs/sdk_support.git
-	branch  = master
-	platforms = efr32
 [submodule "simw-top-mini"]
 	path = third_party/simw-top-mini/repo
 	url = https://github.com/NXP/plug-and-trust.git
@@ -237,10 +232,6 @@
 	url = https://github.com/TexasInstruments/cc13xx_cc26xx_sdk.git
 	branch = main
 	platforms = cc13x2_26x2
-[submodule "third_party/efr32_sdk/wiseconnect-wifi-bt-sdk"]
-	path = third_party/efr32_sdk/wiseconnect-wifi-bt-sdk
-	url = https://github.com/SiliconLabs/wiseconnect-wifi-bt-sdk
-	platforms = efr32
 [submodule "third_party/bouffalolab/bl602"]
 	path = third_party/bouffalolab/bl602_sdk/repo
 	url = https://github.com/bouffalolab/bl_iot_sdk_matter.git
@@ -251,3 +242,18 @@
 	url = https://github.com/NXPmicro/mbedtls.git
 	branch = tinycrypt-mbedtls-2.28
 	platforms = k32w0
+[submodule "third_party/silabs/matter_support"]
+	path = third_party/silabs/matter_support
+	url = https://github.com/SiliconLabs/sdk_support.git
+	branch = main
+	platforms = efr32
+[submodule "third_party/silabs/gecko_sdk"]
+	path = third_party/silabs/gecko_sdk
+	url = https://github.com/SiliconLabs/gecko_sdk.git
+	branch = gsdk_4.1
+	platforms = efr32
+[submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"]
+	path = third_party/silabs/wiseconnect-wifi-bt-sdk
+	url = https://github.com/SiliconLabs/wiseconnect-wifi-bt-sdk.git
+	branch = master
+	platforms = efr32
diff --git a/build_overrides/efr32_sdk.gni b/build_overrides/efr32_sdk.gni
@@ -14,5 +14,5 @@
 
 declare_args() {
   # Root directory for efr32 SDK build files.
-  efr32_sdk_build_root = "//third_party/efr32_sdk"
+  efr32_sdk_build_root = "//third_party/silabs"
 }
diff --git a/examples/build_overrides/efr32_sdk.gni b/examples/build_overrides/efr32_sdk.gni
@@ -14,5 +14,5 @@
 
 declare_args() {
   # Root directory for erf32 SDK.
-  efr32_sdk_build_root = "//third_party/connectedhomeip/third_party/efr32_sdk"
+  efr32_sdk_build_root = "//third_party/connectedhomeip/third_party/silabs"
 }
diff --git a/examples/light-switch-app/efr32/BUILD.gn b/examples/light-switch-app/efr32/BUILD.gn
@@ -89,7 +89,7 @@ if (efr32_board == "BRD4166A" || efr32_board == "BRD4180A") {
 
 # WiFi settings
 if (chip_enable_wifi) {
-  wifi_sdk_dir = "${chip_root}/third_party/efr32_sdk/repo/matter/wifi"
+  wifi_sdk_dir = "${chip_root}/third_party/silabs/matter_support/matter/wifi"
   efr32_lwip_defs = [ "LWIP_NETIF_API=1" ]
   efr32_lwip_defs += [
     "LWIP_IPV4=1",
@@ -102,7 +102,7 @@ if (chip_enable_wifi) {
 
   if (use_rs911x) {
     wiseconnect_sdk_root =
-        "${chip_root}/third_party/efr32_sdk/wiseconnect-wifi-bt-sdk"
+        "${chip_root}/third_party/silabs/wiseconnect-wifi-bt-sdk"
     import("${wifi_sdk_dir}/rs911x/rs911x.gni")
   } else {
     import("${wifi_sdk_dir}/wf200/wf200.gni")

diff --git a/examples/lighting-app/efr32/BUILD.gn b/examples/lighting-app/efr32/BUILD.gn
@@ -89,7 +89,7 @@ if (efr32_board == "BRD4166A" || efr32_board == "BRD4180A") {
 
 # WiFi settings
 if (chip_enable_wifi) {
-  wifi_sdk_dir = "${chip_root}/third_party/efr32_sdk/repo/matter/wifi"
+  wifi_sdk_dir = "${chip_root}/third_party/silabs/matter_support/matter/wifi"
   efr32_lwip_defs = [ "LWIP_NETIF_API=1" ]
   efr32_lwip_defs += [
     "LWIP_IPV4=1",
@@ -102,7 +102,7 @@ if (chip_enable_wifi) {
 
   if (use_rs911x) {
     wiseconnect_sdk_root =
-        "${chip_root}/third_party/efr32_sdk/wiseconnect-wifi-bt-sdk"
+        "${chip_root}/third_party/silabs/wiseconnect-wifi-bt-sdk"
     import("${wifi_sdk_dir}/rs911x/rs911x.gni")
   } else {
     import("${wifi_sdk_dir}/wf200/wf200.gni")

diff --git a/examples/lock-app/efr32/BUILD.gn b/examples/lock-app/efr32/BUILD.gn
@@ -89,7 +89,7 @@ if (efr32_board == "BRD4166A" || efr32_board == "BRD4180A") {
 
 # WiFi settings
 if (chip_enable_wifi) {
-  wifi_sdk_dir = "${chip_root}/third_party/efr32_sdk/repo/matter/wifi"
+  wifi_sdk_dir = "${chip_root}/third_party/silabs/matter_support/matter/wifi"
   efr32_lwip_defs = [ "LWIP_NETIF_API=1" ]
   efr32_lwip_defs += [
     "LWIP_IPV4=1",
@@ -102,7 +102,7 @@ if (chip_enable_wifi) {
 
   if (use_rs911x) {
     wiseconnect_sdk_root =
-        "${chip_root}/third_party/efr32_sdk/wiseconnect-wifi-bt-sdk"
+        "${chip_root}/third_party/silabs/wiseconnect-wifi-bt-sdk"
     import("${wifi_sdk_dir}/rs911x/rs911x.gni")
   } else {
     import("${wifi_sdk_dir}/wf200/wf200.gni")