Merge branch 'project-chip:master' into master

.devcontainer/devcontainer.json

@@ -37,7 +37,8 @@
         "redhat.vscode-yaml",
         "christian-kohler.path-intellisense",
         "knisterpeter.vscode-github",
-        "npclaudiu.vscode-gn"
+        "npclaudiu.vscode-gn",
+        "marus25.cortex-debug"
     ],
     // Use 'settings' to set *default* container specific settings.json values on container create.
     // You can edit these settings after create using File > Preferences > Settings > Remote.

.github/workflows/bloat_check.yaml

@@ -19,7 +19,9 @@ on:
 
 concurrency:
     group: ${{ github.workflow }}
-    cancel-in-progress: true
+    # Don't cancel an already-running bloat check just because it took more
+    # than 5 minutes to run and our cron job is trying to schedule a new one.
+    cancel-in-progress: false
 
 jobs:
     pull_request_update:

.github/workflows/build.yaml

@@ -30,9 +30,11 @@ jobs:
 
         strategy:
             matrix:
-                type: [gcc_debug, gcc_release, clang, mbedtls, clang_experimental]
+                type: [gcc_debug, gcc_release, clang, mbedtls, clang_experimental, no_detail_logging, no_progress_logging]
         env:
             BUILD_TYPE: ${{ matrix.type }}
+            DETAIL_LOGGING: ${{ matrix.type != 'no_detail_logging' && matrix.type != 'no_progress_logging' }}
+            PROGRESS_LOGGING: ${{ matrix.type != 'no_progress_logging' }}
 
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
@@ -85,7 +87,7 @@ jobs:
                      *) ;;
                   esac
 
-                  scripts/build/gn_gen.sh --args="$GN_ARGS"
+                  scripts/build/gn_gen.sh --args="$GN_ARGS chip_detail_logging=${DETAIL_LOGGING} chip_progress_logging=${PROGRESS_LOGGING}"
             - name: Run Build
               timeout-minutes: 10
               run: scripts/build/gn_build.sh

.github/workflows/examples-efr32.yaml

@@ -42,9 +42,7 @@ jobs:
         steps:
             - name: Checkout
               uses: actions/checkout@v2
-              # Fetch depth 0 to get all history and be able to check mergepoint for bloat report
               with:
-                  fetch-depth: 0
                   submodules: true
 #             - name: Initialize CodeQL
 #               uses: github/codeql-action/init@v1

.github/workflows/examples-esp32.yaml

@@ -43,9 +43,7 @@ jobs:
         steps:
             - name: Checkout
               uses: actions/checkout@v2
-              # Fetch depth 0 to get all history and be able to check mergepoint for bloat report
               with:
-                  fetch-depth: 0
                   submodules: true
 #             - name: Initialize CodeQL
 #               uses: github/codeql-action/init@v1

.github/workflows/examples-k32w.yaml

@@ -41,9 +41,7 @@ jobs:
         steps:
             - name: Checkout
               uses: actions/checkout@v2
-              # Fetch depth 0 to get all history and be able to check mergepoint for bloat report
               with:
-                  fetch-depth: 0
                   submodules: true
 #            - name: Initialize CodeQL
 #              uses: github/codeql-action/init@v1

.github/workflows/examples-linux-standalone.yaml

@@ -42,9 +42,7 @@ jobs:
         steps:
             - name: Checkout
               uses: actions/checkout@v2
-              # Fetch depth 0 to get all history and be able to check mergepoint for bloat report
               with:
-                  fetch-depth: 0
                   submodules: true
 #             - name: Initialize CodeQL
 #               uses: github/codeql-action/init@v1

.github/workflows/examples-mbed.yaml

@@ -47,9 +47,7 @@ jobs:
         steps:
             - name: Checkout
               uses: actions/checkout@v2
-              # Fetch depth 0 to get all history and be able to check mergepoint for bloat report
               with:
-                  fetch-depth: 0
                   submodules: true
 
             - name: Build example

.github/workflows/examples-nrfconnect.yaml

@@ -42,9 +42,7 @@ jobs:
         steps:
             - name: Checkout
               uses: actions/checkout@v2
-              # Fetch depth 0 to get all history and be able to check mergepoint for bloat report
               with:
-                  fetch-depth: 0
                   submodules: true
             - name: Bootstrap
               timeout-minutes: 25

.github/workflows/examples-qpg.yaml

@@ -41,9 +41,7 @@ jobs:
         steps:
             - name: Checkout
               uses: actions/checkout@v2
-              # Fetch depth 0 to get all history and be able to check mergepoint for bloat report
               with:
-                  fetch-depth: 0
                   submodules: true
 #             - name: Initialize CodeQL
 #               uses: github/codeql-action/init@v1

build/config/compiler/BUILD.gn

@@ -161,9 +161,27 @@ config("disabled_warnings") {
   }
 }
 
+config("warnings_common") {
+  cflags = [ "-Wall" ]
+
+  ldflags = []
+  if (treat_warnings_as_errors) {
+    cflags += [ "-Werror" ]
+    ldflags += [ "-Werror" ]
+  }
+
+  if (current_os != "mac" && current_os != "ios") {
+    ldflags += [ "-Wl,--fatal-warnings" ]
+  }
+
+  if (current_os != "mac" && current_os != "ios" && current_os != "linux" &&
+      current_os != "win") {
+    cflags += [ "-Wstack-usage=8192" ]
+  }
+}
+
 config("strict_warnings") {
   cflags = [
-    "-Wall",
     "-Wextra",
     "-Wshadow",
     "-Wunreachable-code",
@@ -173,11 +191,6 @@ config("strict_warnings") {
 
   ldflags = []
 
-  if (treat_warnings_as_errors) {
-    cflags += [ "-Werror" ]
-    ldflags += [ "-Werror" ]
-  }
-
   if (is_clang) {
     cflags += [
       "-Wimplicit-fallthrough",
@@ -193,18 +206,27 @@ config("strict_warnings") {
 
 config("warnings_default") {
   configs = [
+    ":warnings_common",
     ":strict_warnings",
     ":disabled_warnings",
   ]
+}
 
-  if (current_os != "mac" && current_os != "ios") {
-    ldflags = [ "-Wl,--fatal-warnings" ]
-  }
+config("disabled_warnings_third_party") {
+  cflags = [
+    "-Wno-unused",
+    "-Wno-format",
+    "-Wno-maybe-uninitialized",
+    "-Wno-address",
+  ]
+}
 
-  if (current_os != "mac" && current_os != "ios" && current_os != "linux" &&
-      current_os != "win") {
-    cflags = [ "-Wstack-usage=8192" ]
-  }
+config("warnings_third_party") {
+  configs = [
+    ":warnings_common",
+    ":disabled_warnings",
+    ":disabled_warnings_third_party",
+  ]
 }
 
 config("symbols_default") {

build/toolchain/custom/BUILD.gn

@@ -0,0 +1,45 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/build.gni")
+import("${build_root}/config/compiler/compiler.gni")
+import("${build_root}/toolchain/gcc_toolchain.gni")
+
+declare_args() {
+  # C compiler to use for target build.
+  target_cc = ""
+
+  # C++ compiler to use for target build.
+  target_cxx = ""
+
+  # Archive tool to use for target build.
+  target_ar = ""
+}
+
+gcc_toolchain("custom") {
+  if (target_cc == "" || target_cxx == "" || target_ar == "") {
+    assert(false,
+           "build arguments target_cc, target_cxx and target_ar need to be set")
+  }
+
+  ar = target_ar
+  cc = target_cc
+  cxx = target_cxx
+
+  toolchain_args = {
+    current_os = target_os
+    current_cpu = target_cpu
+    is_clang = is_clang
+  }
+}

build_overrides/lwip.gni

@@ -12,7 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import("//build_overrides/build.gni")
+
 declare_args() {
   # Root directory for lwIP.
   lwip_root = "//third_party/lwip"
 }
+
+lwip_remove_configs = [ "${build_root}/config/compiler:warnings_default" ]
+lwip_add_configs = [ "${build_root}/config/compiler:warnings_third_party" ]

config/nrfconnect/.nrfconnect-recommended-revision

@@ -1 +1 @@
-910c9ce5ba8ea30155b50b9d12f03ece7123a0c2
+55ae470380f17a949fe45b7686cf5c8743d5fb30

config/nrfconnect/chip-module/CMakeLists.txt

@@ -99,9 +99,11 @@ if (CONFIG_POSIX_API)
 endif()
 
 if (CONFIG_NORDIC_SECURITY_BACKEND)
-    # TODO: Remove when the missing dependency is fixed in nRF Connect SDK
-    zephyr_include_directories(${ZEPHYR_BASE}/../nrfxlib/crypto/nrf_cc310_platform/include)
-
+    zephyr_include_directories($<TARGET_PROPERTY:mbedtls_external,INTERFACE_INCLUDE_DIRECTORIES>)
+    zephyr_include_directories($<TARGET_PROPERTY:mbedcrypto_includes,INTERFACE_INCLUDE_DIRECTORIES>)
+    if(TARGET platform_cc3xx)
+        zephyr_include_directories($<TARGET_PROPERTY:platform_cc3xx,INTERFACE_INCLUDE_DIRECTORIES>)
+    endif()
     list(APPEND CHIP_CFLAGS -DMBEDTLS_CONFIG_FILE=<nrf-config.h>)
 endif()
 

examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

@@ -12119,6 +12119,21 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "current media input",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 0,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
             {
               "name": "cluster revision",
               "code": 65533,
@@ -12450,6 +12465,21 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "current audio output",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 0,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
             {
               "name": "cluster revision",
               "code": 65533,
@@ -12535,6 +12565,36 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "catalog vendor id",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 0,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
+            {
+              "name": "application id",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x00",
+              "reportable": 0,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
             {
               "name": "cluster revision",
               "code": 65533,