project-chip
diff --git a/‎.github/workflows/examples-k32w.yaml
+2-11 b/‎.github/workflows/examples-k32w.yaml
+2-11
diff --git a/‎.github/workflows/examples-rw61x.yaml
+87 b/‎.github/workflows/examples-rw61x.yaml
+87
diff --git a/‎.gitmodules
+3-3 b/‎.gitmodules
+3-3
diff --git a/‎docs/examples/index.md
+9 b/‎docs/examples/index.md
+9
diff --git a/‎docs/guides/nxp_k32w_android_commissioning.md
+9-14 b/‎docs/guides/nxp_k32w_android_commissioning.md
+9-14
diff --git a/‎docs/guides/nxp_manufacturing_flow.md
+60-26 b/‎docs/guides/nxp_manufacturing_flow.md
+60-26
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-k32w:33
+            image: ghcr.io/project-chip/chip-build-k32w:38
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
@@ -46,7 +46,7 @@ jobs:
             - name: Checkout submodules & Bootstrap
               uses: ./.github/actions/checkout-submodules-and-bootstrap
               with:
-                platform: k32w
+                platform: nxp
 
             - name: Set up environment for size reports
               uses: ./.github/actions/setup-size-reports
@@ -59,11 +59,8 @@ jobs:
                   scripts/run_in_build_env.sh "\
                       ./scripts/build/build_examples.py \
                       --target k32w-k32w0-light-crypto-platform-tokenizer \
-                      --target k32w-k32w0-lock-crypto-platform-tokenizer \
-                      --target k32w-k32w0-lock-crypto-platform-low-power-nologs \
                       --target k32w-k32w0-contact-crypto-platform-tokenizer \
                       --target k32w-k32w0-contact-crypto-platform-low-power-nologs \
-                      --target k32w-k32w0-shell-crypto-platform \
                       --target k32w-k32w1-light-crypto-platform-openthread-ftd \
                       --target k32w-k32w1-contact-crypto-platform-low-power-nologs \
                       build \
@@ -79,12 +76,6 @@ jobs:
                     k32w k32w1+release light \
                     out/artifacts/k32w-k32w1-light-crypto-platform-openthread-ftd/chip-k32w1-light-example.elf \
                     /tmp/bloat_reports/
-            - name: Get lock size stats
-              run: |
-                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    k32w k32w0+release lock \
-                    out/artifacts/k32w-k32w0-lock-crypto-platform-tokenizer/chip-k32w0x-lock-example.elf \
-                    /tmp/bloat_reports/
             - name: Get contact size stats
               run: |
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
 
@@ -0,0 +1,87 @@
+# Copyright (c) 2023 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.
+
+name: Build example - RW61X
+
+on:
+    push:
+    pull_request:
+    merge_group:
+
+concurrency:
+    group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
+    cancel-in-progress: true
+
+env:
+    CHIP_NO_LOG_TIMESTAMPS: true
+    
+jobs:
+    rw61x:
+        name: RW61X
+
+        env:
+            BUILD_TYPE: gn_rw61x
+
+        runs-on: ubuntu-latest
+        if: github.actor != 'restyled-io[bot]'
+
+        container:
+            image: ghcr.io/project-chip/chip-build-rw61x:37
+            volumes:
+                - "/tmp/bloat_reports:/tmp/bloat_reports"
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+            - name: Checkout submodules & Bootstrap
+              uses: ./.github/actions/checkout-submodules-and-bootstrap
+              with:
+                platform: rw61x
+
+            - name: Set up environment for size reports
+              uses: ./.github/actions/setup-size-reports
+              if: ${{ !env.ACT }}
+              with:
+                gh-context: ${{ toJson(github) }}
+
+            - name: Build RW61X all clusters example app
+              run: |
+                  scripts/run_in_build_env.sh "\
+                      ./scripts/build/build_examples.py \
+                      --target rw61x-all-clusters-app-wifi \
+                      build \
+                      --copy-artifacts-to out/artifacts \
+                  "
+            
+            - name: Build RW61X thermostat example app
+              run: |
+                  scripts/run_in_build_env.sh "\
+                      ./scripts/build/build_examples.py \
+                      --target rw61x-thermostat-wifi \
+                      build \
+                      --copy-artifacts-to out/artifacts \
+                  "
+            
+            - name: Build RW61X laundry-washer example app
+              run: |
+                  scripts/run_in_build_env.sh "\
+                      ./scripts/build/build_examples.py \
+                      --target rw61x-laundry-washer-wifi \
+                      build \
+                      --copy-artifacts-to out/artifacts \
+                  "
+            - name: Uploading Size Reports
+              uses: ./.github/actions/upload-size-reports
+              if: ${{ !env.ACT }}
+              with:
+                platform-name: RW61X
@@ -54,16 +54,16 @@
 	path = third_party/freertos/repo
 	url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git
 	branch  = V10.3.1-kernel-only
-	platforms = ameba,cc13xx_26xx,bouffalolab,esp32,k32w,infineon,qpg,cc32xx
+	platforms = ameba,cc13xx_26xx,bouffalolab,esp32,infineon,qpg,cc32xx
 [submodule "simw-top-mini"]
 	path = third_party/simw-top-mini/repo
 	url = https://github.com/NXP/plug-and-trust.git
 	branch  = int/CHIPSE_Release
-	platforms = k32w
+	platforms = nxp
 [submodule "third_party/openthread/ot-nxp"]
 	path = third_party/openthread/ot-nxp
 	url = https://github.com/NXP/ot-nxp.git
-	platforms = k32w
+	platforms = nxp
 [submodule "third_party/openthread/ot-qorvo"]
 	path = third_party/openthread/ot-qorvo
 	url = https://github.com/openthread/ot-qorvo.git
 
@@ -112,6 +112,15 @@ kotlin-matter-controller/README
 virtual-device-app/**/README
 ```
 
+## Laundry washer example
+
+```{toctree}
+:glob:
+:maxdepth: 1
+
+laundry-washer-app/**/README
+```
+
 ## Lighting example
 
 ```{toctree}
 
@@ -3,7 +3,7 @@
 This article describes how to use
 [CHIPTool](../../examples/android/CHIPTool/README.md) for Android smartphones to
 commission an NXP K32W061 DK6 running
-[NXP K32W Lock/Light Example Application](#building-and-programming-nxp-k32w-locklight-example-application)
+[NXP K32W Light Example Application](#building-and-programming-nxp-k32w-light-example-application)
 onto a CHIP-enabled Thread network.
 
 <hr>
@@ -12,7 +12,7 @@ onto a CHIP-enabled Thread network.
 -   [Requirements](#requirements)
 -   [Building and programming OpenThread RCP firmware](#building-and-programming-openthread-rcp-firmware)
 -   [Configuring PC as Thread Border Router](#configuring-pc-as-a-thread-border-router)
--   [Building and programming NXP K32W Lock/Light Example Application](#building-and-programming-nxp-k32w-locklight-example-application)
+-   [Building and programming NXP K32W Light Example Application](#building-and-programming-nxp-k32w-light-example-application)
 -   [Building and installing Android CHIPTool](#building-and-installing-android-chiptool)
 -   [Forming a Thread network on the Border Router](#forming-a-thread-network-on-the-border-router)
 -   [Preparing accessory device](#preparing-accessory-device)
@@ -44,7 +44,7 @@ with a spare Wi-Fi card and an
 device.
 
 The following diagram shows the connectivity between network components required
-to allow communication between devices running the CHIPTool and Lock/Light
+to allow communication between devices running the CHIPTool and Light
 applications:
 
 ![nxp_hw_connectivity](../../examples/platform/nxp/k32w/k32w0/doc/images/nxp_hw_connectivity.JPG)
@@ -345,11 +345,7 @@ To make your PC work as a Thread Border Router, complete the following tasks:
 
 <hr>
 
-## Building and programming NXP K32W Lock/Light Example Application
-
-See
-[NXP K32W Lock Example Application README](../../examples/lock-app/nxp/k32w/k32w0/README.md)
-to learn how to build and program the lock example onto an K32W061 DK6.
+## Building and programming NXP K32W Light Example Application
 
 See
 [NXP K32W Light Example Application README](../../examples/lighting-app/nxp/k32w/k32w0/README.md)
@@ -491,11 +487,10 @@ section, complete the following steps:
 
 2. Verify that the text box on the screen is not empty and contains the IPv6
    address of the accessory device.
-3. Tap the following buttons to change the lock/light state:
+3. Tap the following buttons to change the light state:
 
-    - _ON_ and _OFF_ buttons lock/turn on and unlock/turn off the door/light
-      bulb, respectively.
-    - _TOGGLE_ changes the lock/light state to the opposite.
+    - _ON_ and _OFF_ buttons turn on and turn off the light bulb, respectively.
+    - _TOGGLE_ changes the light state to the opposite.
 
-The _LED D3_ on the device turns on or off based on the changes of the
-lock/light state.
+The _LED D3_ on the device turns on or off based on the changes of the light
+state.
@@ -1,8 +1,4 @@
----
-orphan: true
----
-
-# NXP manufacturing data guide
+# NXP Manufacturing data
 
 By default, the example application is configured to use generic test
 certificates and provisioning data embedded with the application code. It is
@@ -112,30 +108,30 @@ Here is the interpretation of the **required** parameters:
 --pai_cert         -> path to the PAI (der format) location
 --spake2p_path     -> path to the spake2p tool
 --out              -> name of the binary that will be used for storing all the generated data
-
-
 ```
 
 Here is the interpretation of the **optional** parameters:
 
 ```shell
---dac_key_password     -> Password to decode DAC key
---dac_key_use_sss_blob -> Used when --dac_key contains a path to an encrypted blob, instead of the
-                          actual DAC private key. The blob metadata size is 24, so the total length
-                          of the resulting value is private key length (32) + 24 = 56. False by default.
---spake2p_verifier     -> SPAKE2+ verifier (passed as base64 encoded string). If this option is set,
-                          all SPAKE2+ inputs will be encoded in the final binary. The spake2p tool
-                          will not be used to generate a new verifier on the fly.
---aes128_key           -> 128 bits AES key used to encrypt the whole dataset. Please make sure
-                          that the target application/board supports this feature: it has access to
-                          the private key and implements a mechanism which can be used to decrypt
-                          the factory data information.
---date                 -> Manufacturing Date (YYYY-MM-DD format)
---part_number          -> Part number as string
---product_url          -> Product URL as string
---product_label        -> Product label as string
---serial_num           -> Serial Number
---unique_id            -> Unique id used for rotating device id generation
+--dac_key_password      -> Password to decode DAC key
+--dac_key_use_sss_blob  -> Used when --dac_key contains a path to an encrypted blob, instead of the
+                           actual DAC private key. The blob metadata size is 24, so the total length
+                           of the resulting value is private key length (32) + 24 = 56. False by default.
+--spake2p_verifier      -> SPAKE2+ verifier (passed as base64 encoded string). If this option is set,
+                           all SPAKE2+ inputs will be encoded in the final binary. The spake2p tool
+                           will not be used to generate a new verifier on the fly.
+--aes128_key            -> 128 bits AES key used to encrypt the whole dataset. Please make sure
+                           that the target application/board supports this feature: it has access to
+                           the private key and implements a mechanism which can be used to decrypt
+                           the factory data information.
+--date                  -> Manufacturing Date (YYYY-MM-DD format)
+--part_number           -> Part number as string
+--product_url           -> Product URL as string
+--product_label         -> Product label as string
+--serial_num            -> Serial Number
+--unique_id             -> Unique id used for rotating device id generation
+--product_finish        -> Visible finish of the product
+--product_primary_color -> Representative color of the visible parts of the product
 ```
 
 ## 3. Write provisioning data
@@ -157,8 +153,18 @@ loadfile factory_data.bin 0xf4000
 where `0xf4000` is the value of `__MATTER_FACTORY_DATA_START` in the
 corresponding .map file (can be different if using a custom linker script).
 
-For the **RT1060**, **RT1170** and **RW61X** platform, the binary needs to be
-written using `MCUXpresso Flash Tool GUI` at the address value corresponding to
+For **RW61X** platform, the binary needs to be written in the internal flash at
+location given by `__MATTER_FACTORY_DATA_START`, using `JLink`:
+
+```
+loadfile factory_data.bin 0xBFFF000
+```
+
+where `0xBFFF000` is the value of `__FACTORY_DATA_START` in the corresponding
+.map file (can be different if using a custom linker script).
+
+For the **RT1060** and **RT1170** platform, the binary needs to be written using
+`MCUXpresso Flash Tool GUI` at the address value corresponding to
 `__FACTORY_DATA_START` (the map file of the application should be checked to get
 the exact value).
 
@@ -198,6 +204,8 @@ Also, demo **DAC**, **PAI** and **PAA** certificates needed in case
 
 ## 6. Increased security for DAC private key
 
+### 6.1 K32W1
+
 Supported platforms:
 
 -   K32W1 - `src/plaftorm/nxp/k32w/k32w1/FactoryDataProviderImpl.h`
@@ -242,3 +250,29 @@ python3 ./scripts/tools/nxp/factory_data_generator/generate.py -i 10000 -s UXKLz
 
 Please note that `--dac_key` now points to a binary file that contains the
 encrypted blob.
+
+### 6.2 RW61X
+
+Supported platforms:
+
+-   RW61X - `src/plaftorm/nxp/rt/rw61x/FactoryDataProviderImpl.h`
+
+For platforms that have a secure subsystem (`SE50`), the DAC private key can be
+converted to an encrypted blob. This blob will overwrite the DAC private key in
+factory data and will be imported in the `SE50` before to sign, by the factory
+data provider instance.
+
+The conversion process shall happen at manufacturing time and should be run one
+time only:
+
+-   Write factory data binary.
+-   Build the application with
+    `chip_with_factory_data=1 chip_convert_dac_private_key=1` set.
+-   Write the application to the board and let it run.
+
+After the conversion process:
+
+-   Make sure the application is built with `chip_with_factory_data=1`, but
+    without `chip_convert_dac_private_key` arg, since conversion already
+    happened.
+-   Write the application to the board.