project-chip
diff --git a/‎.github/.wordlist.txt
+7-6 b/‎.github/.wordlist.txt
+7-6
diff --git a/‎.github/workflows/examples-k32w.yaml
+1-1 b/‎.github/workflows/examples-k32w.yaml
+1-1
diff --git a/‎.restyled.yaml
+1 b/‎.restyled.yaml
+1
diff --git a/‎examples/lighting-app/nxp/k32w/k32w0/BUILD.gn
+5-11 b/‎examples/lighting-app/nxp/k32w/k32w0/BUILD.gn
+5-11
diff --git a/‎examples/lighting-app/nxp/k32w/k32w0/README.md
+35-22 b/‎examples/lighting-app/nxp/k32w/k32w0/README.md
+35-22
@@ -20,7 +20,6 @@ accessor
 AccountLogin
 acdbc
 ack
-ACK
 ACKed
 ACL
 ACLs
@@ -156,7 +155,6 @@ bootable
 Bootloader
 BorderRouterAP
 bouffalolab
-Bouffalolab
 BRD
 breakpoint
 bredr
@@ -332,6 +330,7 @@ cxx
 CY
 CYW
 DAC
+DACs
 dadbdcdddedf
 DAP
 DAPLINK
@@ -449,6 +448,7 @@ dryrun
 DS
 duplicative
 DUT
+DUTS
 DV
 DVK
 dynload
@@ -596,9 +596,9 @@ GPL
 GPLv
 Gradle
 gradlew
+Groupcast
 GroupId
 GroupKeyManagement
-Groupcast
 groupKeySecurityPolicy
 groupKeySetID
 groupsettings
@@ -652,7 +652,6 @@ ignoreQueryImage
 ihex
 IlluminanceMeasurement
 IM
-IsInitiator
 imager
 imagetool
 imageUri
@@ -990,6 +989,7 @@ PAAs
 PacketBuffer
 PAI
 PairDevice
+PAIs
 PAKE
 palletsprojects
 pankore
@@ -1376,13 +1376,14 @@ uint
 ULA
 UNBLUR
 uncommissioned
+Unencrypted
 unfocus
 Unicast
 UniFlash
 UnitLocalization
-Unencrypted
 unpair
 unprovisioned
+Unsecure
 untrusted
 updateAvailable
 updateNotAvailable
@@ -1400,7 +1401,6 @@ userConsentState
 userguide
 USERINTERFACE
 UserLabel
-Unsecure
 usermod
 usr
 UTF
@@ -1419,6 +1419,7 @@ ver
 Verifier
 Verifiers
 VID
+vids
 virtualenv
 visualstudio
 vlatest
 
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-k32w:0.5.99
+            image: connectedhomeip/chip-build-k32w:0.6.02
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
 
@@ -74,6 +74,7 @@ exclude:
     - "examples/chef/zzz_generated/**/*"
     - "src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm" # https://github.com/project-chip/connectedhomeip/issues/20236
     - "src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h" # https://github.com/project-chip/connectedhomeip/issues/20236
+    - "examples/platform/nxp/k32w/k32w0/scripts/demo_generated_certs/**/*"
 
 
 changed_paths:
 
@@ -79,10 +79,13 @@ k32w0_executable("light_app") {
     "main/main.cpp",
   ]
 
+  public = [ "${chip_root}/src/platform/nxp/k32w/k32w0/DefaultTestEventTriggerDelegate.h" ]
+
   deps = [
     ":sdk",
     "${chip_root}/examples/common/QRCode",
-    "${chip_root}/examples/lighting-app/lighting-common/",
+    "${chip_root}/examples/lighting-app/nxp/zap/",
+    "${chip_root}/examples/providers:device_info_provider",
     "${chip_root}/src/lib",
     "${chip_root}/third_party/mbedtls:mbedtls",
     "${k32w0_platform_dir}/app/support:freertos_mbedtls_utils",
@@ -113,16 +116,7 @@ k32w0_executable("light_app") {
       "-Wl,--defsym",
       "-Wl,__app_load_address__=0x4000",
       "-Wl,--defsym",
-      "-Wl,__app_stated_size__=0x99A00",
-    ]
-  }
-
-  if (chip_enable_ota_requestor) {
-    ldflags += [
-      "-Wl,--defsym",
-      "-Wl,__app_load_address__=0x4000",
-      "-Wl,--defsym",
-      "-Wl,__app_stated_size__=0x99A00",
+      "-Wl,__app_stated_size__=0x99200",
     ]
   }
 
 
@@ -22,6 +22,8 @@ network.
     -   [Bluetooth LE Rendezvous](#bluetooth-le-rendezvous)
 -   [Device UI](#device-ui)
 -   [Building](#building)
+    -   [Known issues](#building-issues)
+-   [Manufacturing data](#manufacturing)
 -   [Flashing and debugging](#flashdebug)
 -   [Pigweed Tokenizer](#tokenizer)
     -   [Detokenizer script](#detokenizer)
@@ -193,18 +195,15 @@ effects:
 In order to build the Project CHIP example, we recommend using a Linux
 distribution (the demo-application was compiled on Ubuntu 20.04).
 
--   Download [K32W0 SDK 2.6.6 for Project CHIP](https://mcuxpresso.nxp.com/).
-    Creating an nxp.com account is required before being able to download the
-    SDK. Once the account is created, login and follow the steps for downloading
-    SDK_2_6_6_K32W061DK6 (required for K32W061 flavor). The SDK Builder UI
-    selection should be similar with the one from the image below.
-    ![MCUXpresso SDK Download](../../../../platform/nxp/k32w/k32w0/doc/images/mcux-sdk-download.JPG)
+-   Download
+    [K32W0 SDK 2.6.7](https://cache.nxp.com/lgfiles/bsps/SDK_2_6_7_K32W061DK6.zip).
 
 -   Start building the application either with Secure Element or without
     -   without Secure Element
 
 ```
-user@ubuntu:~/Desktop/git/connectedhomeip$ export NXP_K32W0_SDK_ROOT=/home/user/Desktop/SDK_2_6_6_K32W061DK6/
+user@ubuntu:~/Desktop/git/connectedhomeip$ export NXP_K32W0_SDK_ROOT=/home/user/Desktop/SDK_2_6_7_K32W061DK6/
+user@ubuntu:~/Desktop/git/connectedhomeip$ ./third_party/nxp/k32w0_sdk/sdk_fixes/patch_k32w_sdk.sh
 user@ubuntu:~/Desktop/git/connectedhomeip$ source ./scripts/activate.sh
 user@ubuntu:~/Desktop/git/connectedhomeip$ cd examples/lighting-app/nxp/k32w/k32w0
 user@ubuntu:~/Desktop/git/connectedhomeip/examples/lighting-app/nxp/k32w/k32w0$ gn gen out/debug --args="k32w0_sdk_root=\"${NXP_K32W0_SDK_ROOT}\" chip_with_OM15082=1 chip_with_ot_cli=0 is_debug=false chip_crypto=\"tinycrypt\" chip_with_se05x=0 chip_pw_tokenizer_logging=true mbedtls_repo=\"//third_party/connectedhomeip/third_party/nxp/libs/mbedtls\""
@@ -246,6 +245,20 @@ pycryptodome           3.9.8
 
 The resulting output file can be found in out/debug/chip-k32w0x-light-example.
 
+<a name="building-issues"></a>
+
+## Known issues
+
+-   When using Secure element and cross-compiling on Linux, log messages from
+    the Plug&Trust middleware stack may not echo to the console.
+
+<a name="manufacturing"></a>
+
+## Manufacturing data
+
+See
+[Guide for writing manufacturing data on NXP devices](../../../../platform/nxp/doc/manufacturing_flow.md).
+
 <a name="flashdebug"></a>
 
 ## Flashing and debugging
@@ -414,14 +427,14 @@ Here is the interpretation of the fields:
 Second, image directory 1 must be written:
 
 ```
-DK6Programmer.exe -V5 -s <COM port> -P 1000000 -w image_dir_1=00400000CD040101
+DK6Programmer.exe -V5 -s <COM port> -P 1000000 -w image_dir_1=00400000C9040101
 ```
 
 Here is the interpretation of the fields:
 
 ```
 00400000 -> start address 0x00004000
-CD04     -> 0x4CD pages of 512-bytes (= 614,5kB)
+CD04     -> 0x4C9 pages of 512-bytes (= 612,5kB)
 01       -> bootable flag
 01       -> image type for the application
 ```
@@ -482,42 +495,42 @@ used for connecting the RPis to WiFi.
 Build the Linux OTA provider application:
 
 ```
-doru@computer1:~/connectedhomeip$ : ./scripts/examples/gn_build_example.sh examples/ota-provider-app/linux out/ota-provider-app chip_config_network_layer_ble=false
+user@computer1:~/connectedhomeip$ : ./scripts/examples/gn_build_example.sh examples/ota-provider-app/linux out/ota-provider-app chip_config_network_layer_ble=false
 ```
 
 Build OTA image and start the OTA Provider Application:
 
 ```
-doru@computer1:~/connectedhomeip$ : ./src/app/ota_image_tool.py create -v 0xDEAD -p 0xBEEF -vn 1 -vs "1.0" -da sha256 chip-k32w0x-light-example.bin chip-k32w0x-light-example.ota
-doru@computer1:~/connectedhomeip$ : rm -rf /tmp/chip_*
-doru@computer1:~/connectedhomeip$ : ./out/ota-provider-app/chip-ota-provider-app -f chip-k32w0x-light-example.ota
+user@computer1:~/connectedhomeip$ : ./src/app/ota_image_tool.py create -v 0xDEAD -p 0xBEEF -vn 1 -vs "1.0" -da sha256 chip-k32w0x-light-example.bin chip-k32w0x-light-example.ota
+user@computer1:~/connectedhomeip$ : rm -rf /tmp/chip_*
+user@computer1:~/connectedhomeip$ : ./out/ota-provider-app/chip-ota-provider-app -f chip-k32w0x-light-example.ota
 ```
 
 Build Linux chip-tool:
 
 ```
-doru@computer1:~/connectedhomeip$ : ./scripts/examples/gn_build_example.sh examples/chip-tool out/chip-tool-app
+user@computer1:~/connectedhomeip$ : ./scripts/examples/gn_build_example.sh examples/chip-tool out/chip-tool-app
 ```
 
 Provision the OTA provider application and assign node id _1_. Also, grant ACL
 entries to allow OTA requestors:
 
 ```
-doru@computer1:~/connectedhomeip$ : rm -rf /tmp/chip_*
-doru@computer1:~/connectedhomeip$ : ./out/chip-tool-app/chip-tool pairing onnetwork 1 20202021
-doru@computer1:~/connectedhomeip$ : ./out/chip-tool-app/chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, {"fabricIndex": 1, "privilege": 3, "authMode": 2, "subjects": null, "targets": null}]' 1 0
+user@computer1:~/connectedhomeip$ : rm -rf /tmp/chip_*
+user@computer1:~/connectedhomeip$ : ./out/chip-tool-app/chip-tool pairing onnetwork 1 20202021
+user@computer1:~/connectedhomeip$ : ./out/chip-tool-app/chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, {"fabricIndex": 1, "privilege": 3, "authMode": 2, "subjects": null, "targets": null}]' 1 0
 ```
 
 Provision the device and assign node id _2_:
 
 ```
-doru@computer1:~/connectedhomeip$ : ./out/chip-tool-app/chip-tool pairing ble-thread 2 hex:<operationalDataset> 20202021   3840
+user@computer1:~/connectedhomeip$ : ./out/chip-tool-app/chip-tool pairing ble-thread 2 hex:<operationalDataset> 20202021   3840
 ```
 
 Start the OTA process:
 
 ```
-doru@computer1:~/connectedhomeip$ : ./out/chip-tool-app/chip-tool otasoftwareupdaterequestor announce-ota-provider 1 0 0 0 2 0
+user@computer1:~/connectedhomeip$ : ./out/chip-tool-app/chip-tool otasoftwareupdaterequestor announce-ota-provider 1 0 0 0 2 0
 ```
 
 <a name="otaissues"></a>
@@ -537,16 +550,16 @@ doru@computer1:~/connectedhomeip$ : ./out/chip-tool-app/chip-tool otasoftwareupd
     command:
 
 ```
-doru@computer1:~/connectedhomeip$ : sudo docker kill $container_id
+user@computer1:~/connectedhomeip$ : sudo docker kill $container_id
 ```
 
 -   In order to avoid MDNS issues, only one interface should be active at one
     time. E.g.: if WiFi is used then disable the Ethernet interface and also
     disable multicast on that interface:
 
 ```
-doru@computer1:~/connectedhomeip$ sudo ip link set dev eth0 down
-doru@computer1:~/connectedhomeip$ sudo ifconfig eth0 -multicast
+user@computer1:~/connectedhomeip$ sudo ip link set dev eth0 down
+user@computer1:~/connectedhomeip$ sudo ifconfig eth0 -multicast
 ```
 
 -   If OTBR Docker image is used, then the "-B" parameter should point to the