[K32W0] SDK 2.6.9 platform updates

.github/.wordlist.txt

@@ -1384,6 +1384,7 @@ ug
 ui
 uint
 ULA
+Ultrafast
 UNBLUR
 uncommissioned
 Unencrypted

.github/workflows/examples-k32w.yaml

@@ -28,7 +28,7 @@ env:
 jobs:
     k32w:
         name: K32W
-        timeout-minutes: 60
+        timeout-minutes: 90
 
         env:
             BUILD_TYPE: gn_k32w
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-k32w:0.6.35
+            image: connectedhomeip/chip-build-k32w:0.6.36
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
@@ -75,10 +75,12 @@ jobs:
                   scripts/run_in_build_env.sh "\
                       ./scripts/build/build_examples.py \
                       --target k32w-light-no-ble-se05x \
-                      --target k32w-light-no-ota \
-                      --target k32w-lock-low-power-nologs \
-                      --target k32w-contact-low-power-nologs \
-                      --target k32w-shell \
+                      --target k32w-light-crypto-platform-tokenizer \
+                      --target k32w-lock-crypto-platform-tokenizer \
+                      --target k32w-lock-crypto-platform-low-power-nologs \
+                      --target k32w-contact-crypto-platform-tokenizer \
+                      --target k32w-contact-crypto-platform-low-power-nologs \
+                      --target k32w-shell-crypto-platform \
                       build \
                       --copy-artifacts-to out/artifacts \
                   "
@@ -87,21 +89,21 @@ jobs:
               run: |
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     k32w k32w0+release light \
-                    out/artifacts/k32w-light-no-ota/chip-k32w0x-light-example \
+                    out/artifacts/k32w-light-crypto-platform-tokenizer/chip-k32w0x-light-example \
                     /tmp/bloat_reports/
             - name: Get lock size stats
               timeout-minutes: 5
               run: |
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     k32w k32w0+release lock \
-                    out/artifacts/k32w-lock-low-power-nologs/chip-k32w0x-lock-example \
+                    out/artifacts/k32w-lock-crypto-platform-tokenizer/chip-k32w0x-lock-example \
                     /tmp/bloat_reports/
             - name: Get contact size stats
               timeout-minutes: 5
               run: |
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     k32w k32w0+release contact \
-                    out/artifacts/k32w-contact-low-power-nologs/chip-k32w0x-contact-example \
+                    out/artifacts/k32w-contact-crypto-platform-tokenizer/chip-k32w0x-contact-example \
                     /tmp/bloat_reports/
             - name: Uploading Size Reports
               uses: actions/upload-artifact@v3

.gitmodules

@@ -234,11 +234,6 @@
 	path = third_party/nxp/mw320_sdk/repo
 	url = https://github.com/nxptest/mw320_sdk
 	platforms = mw320
-[submodule "third_party/nxp/libs/mbedtls/repo"]
-	path = third_party/nxp/libs/mbedtls/repo
-	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

examples/contact-sensor-app/nxp/k32w/k32w0/BUILD.gn

@@ -23,6 +23,10 @@ import("${chip_root}/src/crypto/crypto.gni")
 import("${chip_root}/src/lib/core/core.gni")
 import("${chip_root}/src/platform/device.gni")
 
+declare_args() {
+  chip_software_version = 0
+}
+
 if (chip_pw_tokenizer_logging) {
   import("//build_overrides/pigweed.gni")
   import("$dir_pw_tokenizer/database.gni")
@@ -50,6 +54,7 @@ k32w0_sdk("sdk") {
     "${k32w0_platform_dir}/app/project_include",
     "${k32w0_platform_dir}/app/support",
     "${k32w0_platform_dir}/util/include",
+    "${k32w0_platform_dir}/common",
   ]
 
   if (chip_with_se05x == 1) {
@@ -62,6 +67,12 @@ k32w0_sdk("sdk") {
   } else {
     defines += [ "BUILD_RELEASE=1" ]
   }
+
+  if (chip_software_version != 0) {
+    defines += [
+      "CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION=${chip_software_version}",
+    ]
+  }
 }
 
 k32w0_executable("contact_sensor_app") {
@@ -79,6 +90,18 @@ k32w0_executable("contact_sensor_app") {
     "main/main.cpp",
   ]
 
+  if (chip_with_factory_data == 1 && use_custom_factory_provider == 1) {
+    sources += [
+      "${k32w0_platform_dir}/common/CustomFactoryDataProvider.cpp",
+      "${k32w0_platform_dir}/common/CustomFactoryDataProvider.h",
+    ]
+
+    defines = [
+      "CHIP_DEVICE_CONFIG_USE_CUSTOM_PROVIDER=1",
+      "CHIP_DEVICE_CONFIG_CUSTOM_PROVIDER_NUMBER_IDS=3",
+    ]
+  }
+
   deps = [
     ":sdk",
     "${chip_root}/examples/common/QRCode",
@@ -109,16 +132,27 @@ k32w0_executable("contact_sensor_app") {
 
   inputs = [ ldscript ]
 
-  ldflags = [ "-T" + rebase_path(ldscript, root_build_dir) ]
+  ldflags = [
+    "-T" + rebase_path(ldscript, root_build_dir),
+    "-Wl,-print-memory-usage",
+  ]
 
   if (chip_enable_ota_requestor) {
-    ldflags += [
-      "-Wl,--defsym",
-      "-Wl,__app_load_address__=0x4000",
-      "-Wl,--defsym",
-      "-Wl,__app_stated_size__=0x99200",
-      "-Wl,-print-memory-usage",
-    ]
+    if (chip_reduce_ssbl_size) {
+      ldflags += [
+        "-Wl,--defsym",
+        "-Wl,__app_load_address__=0x2000",
+        "-Wl,--defsym",
+        "-Wl,__app_stated_size__=0x9B200",
+      ]
+    } else {
+      ldflags += [
+        "-Wl,--defsym",
+        "-Wl,__app_load_address__=0x4000",
+        "-Wl,--defsym",
+        "-Wl,__app_stated_size__=0x99200",
+      ]
+    }
   }
 }