[nrfconnect] Switched to using nRF Connect SDK 2.1.1 version (project…

…-chip#23333) Changed recommended nRF Connect SDK revision to 2.1.1 and did some necessary alignments: * nRF platform - Added support for SPI NOR external flash - Enabled entering QSPI NOR deep sleep mode for nRF52 family * nRF examples - Removed flash controller configuration from examples DTS - Aligned DFUOverSMP callback API and optimized power consumption by disabling QSPI NOR - Fixed emitting leave event at factory reset in window-app - Moved OTARequestor initialization to kDnssdPlatformInitialized event handler to avoid race condition (sending NotifyUpdateApplied if SRP client is not yet fully initialized) - Changed MRP local active retry interval for lighting-app to avoid packet stall while switching from Thread child to router
ARM-software · Nov 17, 2022 · c2040e3 · c2040e3
1 parent 8936ec0
commit c2040e3
Show file tree

Hide file tree

Showing 57 changed files with 167 additions and 466 deletions.
diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml
@@ -30,7 +30,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.6.03
+            image: connectedhomeip/chip-build:0.6.05
 
         steps:
             - uses: Wandalen/[email protected]

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.03
+            image: connectedhomeip/chip-build:0.6.05
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -133,7 +133,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.03
+            image: connectedhomeip/chip-build:0.6.05
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -287,7 +287,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.03
+            image: connectedhomeip/chip-build:0.6.05
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --sysctl "net.ipv6.conf.all.disable_ipv6=0

diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml
@@ -29,7 +29,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.03
+            image: connectedhomeip/chip-build:0.6.05
             options: --user root
 
         steps:
@@ -57,7 +57,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.6.03
+            image: connectedhomeip/chip-build-esp32:0.6.05
             options: --user root
 
         steps:
@@ -85,7 +85,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-nrf-platform:0.6.03
+            image: connectedhomeip/chip-build-nrf-platform:0.6.05
             options: --user root
 
         steps:

diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml
@@ -29,7 +29,7 @@ jobs:
         timeout-minutes: 90
 
         env:
-            DOCKER_RUN_VERSION: 0.6.03
+            DOCKER_RUN_VERSION: 0.6.05
             GITHUB_CACHE_PATH: /tmp/cirque-cache/
 
         runs-on: ubuntu-latest
@@ -38,7 +38,7 @@ jobs:
         # need to run with privilege, which isn't supported by job.XXX.contaner
         #  https://github.com/actions/container-action/issues/2
         #         container:
-        #             image: connectedhomeip/chip-build-cirque:0.6.03
+        #             image: connectedhomeip/chip-build-cirque:0.6.05
         #             volumes:
         #                 - "/tmp:/tmp"
         #                 - "/dev/pts:/dev/pts"

diff --git a/.github/workflows/doxygen.yaml b/.github/workflows/doxygen.yaml
@@ -82,7 +82,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build-doxygen:0.6.03
+            image: connectedhomeip/chip-build-doxygen:0.6.05
 
         if: github.actor != 'restyled-io[bot]'
 

diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml
@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-ameba:0.6.03
+            image: connectedhomeip/chip-build-ameba:0.6.05
             options: --user root
 
         steps:

diff --git a/.github/workflows/examples-cc13x2x7_26x2x7.yaml b/.github/workflows/examples-cc13x2x7_26x2x7.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-ti:0.6.03
+            image: connectedhomeip/chip-build-ti:0.6.05
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:

diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -35,7 +35,7 @@ jobs:
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: connectedhomeip/chip-build-efr32:0.6.03
+      image: connectedhomeip/chip-build-efr32:0.6.05
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:

diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
@@ -31,7 +31,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.6.03
+            image: connectedhomeip/chip-build-esp32:0.6.05
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -119,7 +119,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.6.03
+            image: connectedhomeip/chip-build-esp32:0.6.05
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml
@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-infineon:0.6.03
+            image: connectedhomeip/chip-build-infineon:0.6.05
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:

diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-k32w:0.6.03
+            image: connectedhomeip/chip-build-k32w:0.6.05
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:

diff --git a/.github/workflows/examples-linux-arm.yaml b/.github/workflows/examples-linux-arm.yaml
@@ -31,7 +31,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-crosscompile:0.6.03
+            image: connectedhomeip/chip-build-crosscompile:0.6.05
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/.github/workflows/examples-linux-imx.yaml b/.github/workflows/examples-linux-imx.yaml
@@ -31,7 +31,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-imx:0.6.03
+            image: connectedhomeip/chip-build-imx:0.6.05
 
         steps:
             - uses: Wandalen/[email protected]

diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.03
+            image: connectedhomeip/chip-build:0.6.05
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-mbed-os:0.6.03
+            image: connectedhomeip/chip-build-mbed-os:0.6.05
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/.github/workflows/examples-mw320.yaml b/.github/workflows/examples-mw320.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.03
+            image: connectedhomeip/chip-build:0.6.05
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:

diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-nrf-platform:0.6.03
+            image: connectedhomeip/chip-build-nrf-platform:0.6.05
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.03
+            image: connectedhomeip/chip-build:0.6.05
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:

diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-telink:0.6.03
+            image: connectedhomeip/chip-build-telink:0.6.05
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml
@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-tizen:0.6.03
+            image: connectedhomeip/chip-build-tizen:0.6.05
             options: --user root
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"

diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-android:0.6.03
+            image: connectedhomeip/chip-build-android:0.6.05
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 

diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml
@@ -31,7 +31,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.03
+            image: connectedhomeip/chip-build:0.6.05
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -28,7 +28,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.6.02
+            image: connectedhomeip/chip-build:0.6.05
 
         steps:
             - uses: Wandalen/[email protected]

diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32-qemu:0.6.03
+            image: connectedhomeip/chip-build-esp32-qemu:0.6.05
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 

diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml
@@ -29,7 +29,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.6.03
+            image: connectedhomeip/chip-build-esp32:0.6.05
 
         steps:
             - uses: Wandalen/[email protected]
@@ -75,7 +75,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-efr32:0.6.03
+            image: connectedhomeip/chip-build-efr32:0.6.05
         steps:
             - uses: Wandalen/[email protected]
               name: Checkout

diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-android:0.6.03
+            image: connectedhomeip/chip-build-android:0.6.05
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -44,7 +44,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.6.03
+            image: connectedhomeip/chip-build:0.6.05
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
 
@@ -347,7 +347,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.6.03
+            image: connectedhomeip/chip-build:0.6.05
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
 

diff --git a/.github/workflows/unit_integration_test.yaml b/.github/workflows/unit_integration_test.yaml
@@ -37,7 +37,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.6.03
+            image: connectedhomeip/chip-build:0.6.05
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"

diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml
@@ -28,7 +28,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build-zap:0.6.03
+            image: connectedhomeip/chip-build-zap:0.6.05
         defaults:
             run:
                 shell: sh

diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
@@ -29,7 +29,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build-zap:0.6.03
+            image: connectedhomeip/chip-build-zap:0.6.05
         defaults:
             run:
                 shell: sh

diff --git a/config/nrfconnect/.nrfconnect-recommended-revision b/config/nrfconnect/.nrfconnect-recommended-revision
@@ -1 +1 @@
-v2.0.2
+v2.1.1
diff --git a/config/nrfconnect/chip-module/Kconfig.defaults b/config/nrfconnect/chip-module/Kconfig.defaults
@@ -181,10 +181,25 @@ config CHIP_OTA_REQUESTOR
     bool
     default y
 
+# All boards besides nRF7002DK use QSPI NOR external flash
+if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF52840DK_NRF52840
+
 config CHIP_QSPI_NOR
     bool
     default y
 
+endif # BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF52840DK_NRF52840
+
+# nRF7002DK uses SPI NOR external flash
+
+if BOARD_NRF7002DK_NRF5340_CPUAPP
+
+config CHIP_SPI_NOR
+    bool
+    default y
+
+endif # BOARD_NRF7002DK_NRF5340_CPUAPP
+
 # Enable extended discovery
 config CHIP_EXTENDED_DISCOVERY
     bool