[nrfconnect] Use nRF Connect SDK 2.0.2 (#21397)

* [nrfconnect] Use nRF Connect SDK 2.0.2 Use the newest SDK release to include the support for Thread 1.3. Signed-off-by: Damian Krolik <damian.krolik@nordicsemi.no> * Bump all docker images in workflows Co-authored-by: Justin Wood <woody@apple.com>
project-chip · Jul 30, 2022 · 78dd131 · 78dd131
1 parent e9141e2
commit 78dd131
Show file tree

Hide file tree

Showing 59 changed files with 50 additions and 75 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.5.89
+            image: connectedhomeip/chip-build:0.5.91
 
         steps:
             - uses: Wandalen/wretry.action@v1.0.15

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.5.89
+            image: connectedhomeip/chip-build:0.5.91
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -128,7 +128,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.89
+            image: connectedhomeip/chip-build:0.5.91
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -279,7 +279,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.89
+            image: connectedhomeip/chip-build:0.5.91
             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
@@ -30,7 +30,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.89
+            image: connectedhomeip/chip-build:0.5.91
             options: --user root
 
         steps:
@@ -58,7 +58,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.5.89
+            image: connectedhomeip/chip-build-esp32:0.5.91
             options: --user root
 
         steps:
@@ -86,7 +86,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-nrf-platform:0.5.89
+            image: connectedhomeip/chip-build-nrf-platform:0.5.91
             options: --user root
 
         steps:

diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml
@@ -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.5.89
+        #             image: connectedhomeip/chip-build-cirque:0.5.91
         #             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.5.89
+            image: connectedhomeip/chip-build-doxygen:0.5.91
 
         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.5.89
+            image: connectedhomeip/chip-build-ameba:0.5.91
             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.5.89
+            image: connectedhomeip/chip-build-ti:0.5.91
             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.5.89
+      image: connectedhomeip/chip-build-efr32:0.5.91
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:

diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.5.89
+            image: connectedhomeip/chip-build-esp32:0.5.91
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -118,7 +118,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.5.89
+            image: connectedhomeip/chip-build-esp32:0.5.91
             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.5.89
+            image: connectedhomeip/chip-build-infineon:0.5.91
 
         steps:
             - uses: Wandalen/wretry.action@v1.0.15

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.5.89
+            image: connectedhomeip/chip-build-crosscompile:0.5.91
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

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.5.89
+            image: connectedhomeip/chip-build:0.5.91
             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.5.89
+            image: connectedhomeip/chip-build-mbed-os:0.5.91
             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.5.89
+            image: connectedhomeip/chip-build:0.5.91
             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.5.89
+            image: connectedhomeip/chip-build-nrf-platform:0.5.91
             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.5.89
+            image: connectedhomeip/chip-build:0.5.91
             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.5.89
+            image: connectedhomeip/chip-build-telink:0.5.91
             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.5.89
+            image: connectedhomeip/chip-build-tizen:0.5.91
             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.5.89
+            image: connectedhomeip/chip-build-android:0.5.91
             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.5.89
+            image: connectedhomeip/chip-build:0.5.91
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 

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.5.89
+            image: connectedhomeip/chip-build-esp32-qemu:0.5.91
             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.5.89
+            image: connectedhomeip/chip-build-esp32:0.5.91
 
         steps:
             - uses: Wandalen/wretry.action@v1.0.15
@@ -75,7 +75,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-efr32:0.5.89
+            image: connectedhomeip/chip-build-efr32:0.5.91
         steps:
             - uses: Wandalen/wretry.action@v1.0.15
               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.5.89
+            image: connectedhomeip/chip-build-android:0.5.91
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -43,7 +43,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.5.89
+            image: connectedhomeip/chip-build:0.5.91
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
 
@@ -239,7 +239,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.5.89
+            image: connectedhomeip/chip-build:0.5.91
             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/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.5.89
+            image: connectedhomeip/chip-build:0.5.91
             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.5.89
+            image: connectedhomeip/chip-build-zap:0.5.91
         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.5.89
+            image: connectedhomeip/chip-build-zap:0.5.91
         defaults:
             run:
                 shell: sh

diff --git a/config/nrfconnect/.nrfconnect-recommended-revision b/config/nrfconnect/.nrfconnect-recommended-revision
@@ -1 +1 @@
-fd5905aa6b04febd99d00dba6c482ac25eb15222
+v2.0.2
diff --git a/config/nrfconnect/chip-module/Kconfig.defaults b/config/nrfconnect/chip-module/Kconfig.defaults
@@ -205,6 +205,10 @@ config NET_L2_OPENTHREAD
     bool
     default y
 
+choice OPENTHREAD_STACK_VERSION
+	default OPENTHREAD_THREAD_VERSION_1_3
+endchoice
+
 # Enable mbedTLS from nrf_security library
 
 choice OPENTHREAD_SECURITY

diff --git a/examples/all-clusters-app/nrfconnect/prj.conf b/examples/all-clusters-app/nrfconnect/prj.conf
@@ -25,7 +25,6 @@ CONFIG_STD_CPP14=y
 CONFIG_DK_LIBRARY=y
 
 # OpenThread settings
-CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y
 CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y
 CONFIG_OPENTHREAD_MTD=y
 CONFIG_OPENTHREAD_FTD=n

diff --git a/examples/all-clusters-app/nrfconnect/prj_dfu.conf b/examples/all-clusters-app/nrfconnect/prj_dfu.conf
@@ -25,7 +25,6 @@ CONFIG_STD_CPP14=y
 CONFIG_DK_LIBRARY=y
 
 # OpenThread settings
-CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y
 CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y
 CONFIG_OPENTHREAD_MTD=y
 CONFIG_OPENTHREAD_FTD=n

diff --git a/examples/all-clusters-app/nrfconnect/prj_release.conf b/examples/all-clusters-app/nrfconnect/prj_release.conf
@@ -25,7 +25,6 @@ CONFIG_STD_CPP14=y
 CONFIG_DK_LIBRARY=y
 
 # OpenThread settings
-CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y
 CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y
 CONFIG_OPENTHREAD_MTD=y
 CONFIG_OPENTHREAD_FTD=n

diff --git a/examples/all-clusters-minimal-app/nrfconnect/prj.conf b/examples/all-clusters-minimal-app/nrfconnect/prj.conf
@@ -25,7 +25,6 @@ CONFIG_STD_CPP14=y
 CONFIG_DK_LIBRARY=y
 
 # OpenThread settings
-CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y
 CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y
 CONFIG_OPENTHREAD_MTD=y
 CONFIG_OPENTHREAD_FTD=n

diff --git a/examples/all-clusters-minimal-app/nrfconnect/prj_dfu.conf b/examples/all-clusters-minimal-app/nrfconnect/prj_dfu.conf
@@ -25,7 +25,6 @@ CONFIG_STD_CPP14=y
 CONFIG_DK_LIBRARY=y
 
 # OpenThread settings
-CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y
 CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y
 CONFIG_OPENTHREAD_MTD=y
 CONFIG_OPENTHREAD_FTD=n

diff --git a/examples/all-clusters-minimal-app/nrfconnect/prj_release.conf b/examples/all-clusters-minimal-app/nrfconnect/prj_release.conf
@@ -25,7 +25,6 @@ CONFIG_STD_CPP14=y
 CONFIG_DK_LIBRARY=y
 
 # OpenThread settings
-CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y
 CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y
 CONFIG_OPENTHREAD_MTD=y
 CONFIG_OPENTHREAD_FTD=n

diff --git a/examples/chef/nrfconnect/prj.conf b/examples/chef/nrfconnect/prj.conf
@@ -26,7 +26,6 @@ CONFIG_DK_LIBRARY=y
 CONFIG_PWM=y
 
 # OpenThread configs
-CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y
 CONFIG_OPENTHREAD_NORDIC_LIBRARY_FTD=y
 
 # Default OpenThread network settings

diff --git a/examples/light-switch-app/nrfconnect/prj.conf b/examples/light-switch-app/nrfconnect/prj.conf
@@ -25,7 +25,6 @@ CONFIG_STD_CPP14=y
 CONFIG_DK_LIBRARY=y
 
 # OpenThread configs
-CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y
 CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y
 CONFIG_OPENTHREAD_MTD=y
 CONFIG_OPENTHREAD_FTD=n

diff --git a/examples/light-switch-app/nrfconnect/prj_no_dfu.conf b/examples/light-switch-app/nrfconnect/prj_no_dfu.conf
@@ -25,7 +25,6 @@ CONFIG_STD_CPP14=y
 CONFIG_DK_LIBRARY=y
 
 # OpenThread configs
-CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y
 CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y
 CONFIG_OPENTHREAD_MTD=y
 CONFIG_OPENTHREAD_FTD=n

diff --git a/examples/light-switch-app/nrfconnect/prj_release.conf b/examples/light-switch-app/nrfconnect/prj_release.conf
@@ -25,7 +25,6 @@ CONFIG_STD_CPP14=y
 CONFIG_DK_LIBRARY=y
 
 # OpenThread configs
-CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y
 CONFIG_OPENTHREAD_NORDIC_LIBRARY_MTD=y
 CONFIG_OPENTHREAD_MTD=y
 CONFIG_OPENTHREAD_FTD=n