Skip to content

Commit c2049d8

Browse files
[NXP][examples][k32w0] Update paths after nxp_matter_support switch
Signed-off-by: marius-alex-tache <marius.tache@nxp.com> (cherry picked from commit 871ea893b3ad1f7d6d7b6943827a666b89f50b8f)
1 parent 1aabffc commit c2049d8

File tree

6 files changed

+28
-28
lines changed

6 files changed

+28
-28
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ if (chip_pw_tokenizer_logging) {
4141

4242
assert(current_os == "freertos")
4343

44-
k32w0_platform_dir = "${chip_root}/examples/platform/nxp/k32w0"
44+
k32w0_platform_dir = "${nxp_sdk_matter_support_root}/examples/platform/k32w0"
4545

4646
k32w0_sdk("sdk") {
4747
sources = [

examples/contact-sensor-app/nxp/k32w0/README.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ network.
4949

5050
## Introduction
5151

52-
![K32W061 DK6](../../../platform/nxp/k32w0/doc/images/k32w-dk6.jpg)
52+
![K32W061 DK6](../../../../third_party/nxp/nxp_matter_support/examples/platform/k32w0/doc/images/k32w-dk6.jpg)
5353

5454
The K32W061 contact sensor example application provides a working demonstration
5555
of a connected contact sensor device, built using the Project CHIP codebase and
@@ -79,7 +79,7 @@ Deployment of this firmware configuration requires the K32W061 board setups
7979
using the K32W061 module board, SE051 Expansion board and Generic Expansion
8080
board as shown below:
8181

82-
![SE051H + K32W061 DK6](../../../platform/nxp/k32w0/doc/images/k32w-se.jpg)
82+
![SE051H + K32W061 DK6](../../../../third_party/nxp/nxp_matter_support/examples/platform/k32w0/doc/images/k32w-se.jpg)
8383

8484
The SE051H Secure Element extension may be used for best in class security and
8585
offloading some of the Project CHIP cryptographic operations. Depending on your
@@ -356,17 +356,17 @@ See
356356
[Guide for writing manufacturing data on NXP devices](../../../../docs/guides/nxp/nxp_manufacturing_flow.md).
357357

358358
There are factory data generated binaries available in
359-
examples/platform/nxp/k32w0/scripts/demo_generated_factory_data folder.
359+
`third_party/nxp/nxp_matter_support/examples/platform/k32w0/scripts/demo_generated_factory_data` folder.
360360
These are based on the DAC, PAI and PAA certificates found in
361361
scripts/tools/nxp/demo_generated_certs folder. The demo_factory_data_dut1.bin
362362
uses the DAC certificate and private key found in
363-
examples/platform/nxp/k32w0/scripts/demo_generated_factory_data/dac/dut1
363+
`third_party/nxp/nxp_matter_support/examples/platform/k32w0/scripts/demo_generated_factory_data/dac/dut1`
364364
folder. The demo_factory_data_dut2.bin uses the DAC certificate and private key
365365
found in
366-
examples/platform/nxp/k32w0/scripts/demo_generated_factory_data/dac/dut2
366+
`third_party/nxp/nxp_matter_support/examples/platform/k32w0/scripts/demo_generated_factory_data/dac/dut2`
367367
folder. These two factory data binaries can be used for testing topologies with
368368
2 DUTS. They contain the corresponding DACs/PAIs generated using
369-
generate_nxp_chip_factory_bin.py script. The discriminator is 14014 and the
369+
`generate_nxp_chip_factory_bin.py` script. The discriminator is 14014 and the
370370
passcode is 1000. These demo certificates are working with the CDs installed in
371371
CHIPProjectConfig.h.
372372

@@ -375,7 +375,7 @@ Regarding factory data provider, there are two options:
375375
- use the default factory data provider: `FactoryDataProviderImpl` by setting
376376
`chip_with_factory_data=1` in the gn build command.
377377
- use a custom factory data provider: please see
378-
[Guide for implementing a custom factory data provider](../../../platform/nxp/k32w0/common/README.md).
378+
[Guide for implementing a custom factory data provider](../../../../third_party/nxp/nxp_matter_support/examples/platform/k32w0/common/README.md).
379379
This can be enabled when `chip_with_factory_data=1` by setting
380380
`use_custom_factory_provider=1` in the gn build command.
381381

@@ -509,7 +509,7 @@ needed for parsing the hashed scripts.
509509

510510
The python3 script detokenizer.py is a script that decodes the tokenized logs
511511
either from a file or from a serial port. It is located in the following path
512-
`examples/platform/nxp/k32w0/scripts/detokenizer.py`.
512+
`third_party/nxp/nxp_matter_support/examples/platform/k32w0/scripts/detokenizer.py`.
513513

514514
The script can be used in the following ways:
515515

@@ -544,7 +544,7 @@ by the script is loaded by the environment. An example of running the
544544
detokenizer script to see logs of a contact-sensor app:
545545

546546
```
547-
python3 ../../../../examples/platform/nxp/k32w0/scripts/detokenizer.py serial -i /dev/ttyACM0 -d out/debug/chip-k32w0x-contact-example-database.bin -o device.txt
547+
python3 ../../../../third_party/nxp/nxp_matter_support/examples/platform/k32w0/scripts/detokenizer.py serial -i /dev/ttyACM0 -d out/debug/chip-k32w0x-contact-example-database.bin -o device.txt
548548
```
549549

550550
### Known issues tokenizer
@@ -616,7 +616,7 @@ is done.
616616
The OTA topology used for OTA testing is illustrated in the figure below.
617617
Topology is similar with the one used for Matter Test Events.
618618

619-
![OTA_TOPOLOGY](../../../platform/nxp/k32w0/doc/images/ota_topology.JPG)
619+
![OTA_TOPOLOGY](../../../../third_party/nxp/nxp_matter_support/examples/platform/k32w0/doc/images/ota_topology.JPG)
620620

621621
The concept for OTA is the next one:
622622

@@ -795,13 +795,13 @@ Power Measurement Tool can be used inside MCUXpresso for checking the power
795795
consumption pattern: Window -> Show View -> Other -> Power Measurement Tool. The
796796
configuration for this tool is the next one:
797797

798-
![POWER_CONF](../../../platform/nxp/k32w0/doc/images/power_conf.JPG)
798+
![POWER_CONF](../../../../third_party/nxp/nxp_matter_support/examples/platform/k32w0/doc/images/power_conf.JPG)
799799

800800
Also, please make sure that the J14 jumper is set to the _ENABLED_ position and
801801
no expansion board is attached to the DK6. A view from this tool is illustrated
802802
below:
803803

804-
![POWER_VIEW](../../../platform/nxp/k32w0/doc/images/power_view.JPG)
804+
![POWER_VIEW](../../../../third_party/nxp/nxp_matter_support/examples/platform/k32w0/doc/images/power_view.JPG)
805805

806806
Please note that that the Power Measurement Tool is not very accurate and
807807
professional tools must be used if exact power consumption needs to be known.

examples/lighting-app/nxp/k32w0/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if (chip_pw_tokenizer_logging) {
4040

4141
assert(current_os == "freertos")
4242

43-
k32w0_platform_dir = "${chip_root}/examples/platform/nxp/k32w0"
43+
k32w0_platform_dir = "${nxp_sdk_matter_support_root}/examples/platform/k32w0"
4444

4545
k32w0_sdk("sdk") {
4646
sources = [

examples/lighting-app/nxp/k32w0/README.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ network.
4747

4848
## Introduction
4949

50-
![K32W061 DK6](../../../platform/nxp/k32w0/doc/images/k32w-dk6.jpg)
50+
![K32W061 DK6](../../../../third_party/nxp/nxp_matter_support/examples/platform//k32w0/doc/images/k32w-dk6.jpg)
5151

5252
The K32W061 lighting example application provides a working demonstration of a
5353
light bulb device, built using the Project CHIP codebase and the NXP K32W061
@@ -77,7 +77,7 @@ Deployment of this firmware configuration requires the K32W061 board setups
7777
using the K32W061 module board, SE051 Expansion board and Generic Expansion
7878
board as shown below:
7979

80-
![SE051H + K32W061 DK6](../../../platform/nxp/k32w0/doc/images/k32w-se.jpg)
80+
![SE051H + K32W061 DK6](../../../../third_party/nxp/nxp_matter_support/examples/platform//k32w0/doc/images/k32w-se.jpg)
8181

8282
The SE051H Secure Element extension may be used for best in class security and
8383
offloading some of the Project CHIP cryptographic operations. Depending on your
@@ -332,17 +332,17 @@ See
332332
[Guide for writing manufacturing data on NXP devices](../../../../docs/guides/nxp/nxp_manufacturing_flow.md).
333333

334334
There are factory data generated binaries available in
335-
examples/platform/nxp/k32w0/scripts/demo_generated_factory_data folder.
335+
`third_party/nxp/nxp_matter_support/examples/platform/k32w0/scripts/demo_generated_factory_data` folder.
336336
These are based on the DAC, PAI and PAA certificates found in
337337
scripts/tools/nxp/demo_generated_certs folder. The demo_factory_data_dut1.bin
338338
uses the DAC certificate and private key found in
339-
examples/platform/nxp/k32w0/scripts/demo_generated_factory_data/dac/dut1
339+
`third_party/nxp/nxp_matter_support/examples/platform/k32w0/scripts/demo_generated_factory_data/dac/dut1`
340340
folder. The demo_factory_data_dut2.bin uses the DAC certificate and private key
341341
found in
342-
examples/platform/nxp/k32w0/scripts/demo_generated_factory_data/dac/dut2
342+
`third_party/nxp/nxp_matter_support/examples/platform/k32w0/scripts/demo_generated_factory_data/dac/dut2`
343343
folder. These two factory data binaries can be used for testing topologies with
344344
2 DUTS. They contain the corresponding DACs/PAIs generated using
345-
generate_nxp_chip_factory_bin.py script. The discriminator is 14014 and the
345+
`generate_nxp_chip_factory_bin.py` script. The discriminator is 14014 and the
346346
passcode is 1000. These demo certificates are working with the CDs installed in
347347
CHIPProjectConfig.h.
348348

@@ -351,7 +351,7 @@ Regarding factory data provider, there are two options:
351351
- use the default factory data provider: `FactoryDataProviderImpl` by setting
352352
`chip_with_factory_data=1` in the gn build command.
353353
- use a custom factory data provider: please see
354-
[Guide for implementing a custom factory data provider](../../../platform/nxp/k32w0/common/README.md).
354+
[Guide for implementing a custom factory data provider](../../../../third_party/nxp/nxp_matter_support/examples/platform//k32w0/common/README.md).
355355
This can be enabled when `chip_with_factory_data=1` by setting
356356
`use_custom_factory_provider=1` in the gn build command.
357357

@@ -485,7 +485,7 @@ needed for parsing the hashed scripts.
485485

486486
The python3 script detokenizer.py is a script that decodes the tokenized logs
487487
either from a file or from a serial port. It is located in the following path
488-
`examples/platform/nxp/k32w0/scripts/detokenizer.py`.
488+
`third_party/nxp/nxp_matter_support/examples/platform/k32w0/scripts/detokenizer.py`.
489489

490490
The script can be used in the following ways:
491491

@@ -520,7 +520,7 @@ by the script is loaded by the environment. An example of running the
520520
detokenizer script to see logs of a lighting app:
521521

522522
```
523-
python3 ../../../../examples/platform/nxp/k32w0/scripts/detokenizer.py serial -i /dev/ttyACM0 -d out/debug/chip-k32w0x-light-example-database.bin -o device.txt
523+
python3 ../../../../third_party/nxp/nxp_matter_support/examples/platform/k32w0/scripts/detokenizer.py serial -i /dev/ttyACM0 -d out/debug/chip-k32w0x-light-example-database.bin -o device.txt
524524
```
525525

526526
### Known issues tokenizer
@@ -592,7 +592,7 @@ is done.
592592
The OTA topology used for OTA testing is illustrated in the figure below.
593593
Topology is similar with the one used for Matter Test Events.
594594

595-
![OTA_TOPOLOGY](../../../platform/nxp/k32w0/doc/images/ota_topology.JPG)
595+
![OTA_TOPOLOGY](../../../../third_party/nxp/nxp_matter_support/examples/platform//k32w0/doc/images/ota_topology.JPG)
596596

597597
The concept for OTA is the next one:
598598

src/platform/nxp/k32w0/args.gni

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ nxp_use_mbedtls_port = false
2424

2525
if (getenv("NXP_K32W0_SDK_ROOT") == "") {
2626
k32w0_sdk_root =
27-
"${nxp_sdk_matter_support_root}/github_sdk/k32w0_sdk/repo"
27+
"${nxp_sdk_matter_support_root}/github_sdk/k32w0/repo"
2828
} else {
2929
k32w0_sdk_root = getenv("NXP_K32W0_SDK_ROOT")
3030
}
@@ -72,6 +72,6 @@ openthread_external_mbedtls = mbedtls_target
7272
openthread_project_core_config_file = "OpenThreadConfig.h"
7373
openthread_core_config_platform_check_file =
7474
"openthread-core-k32w061-config-check.h"
75-
openthread_core_config_deps = [ "${chip_root}/examples/platform/nxp/k32w0:openthread_core_config_k32w0_chip_examples" ]
75+
openthread_core_config_deps = [ "${nxp_sdk_matter_support_root}/examples/platform/k32w0:openthread_core_config_k32w0_chip_examples" ]
7676

7777
openthread_external_platform = "${chip_root}/third_party/openthread/platforms/nxp/k32w0:libopenthread-k32w0"

third_party/openthread/platforms/nxp/k32w0/BUILD.gn

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ config("openthread_k32w0_config") {
3030
"${openthread_nxp_root}/src/k32w0/platform",
3131
"${openthread_nxp_root}/src/common",
3232
]
33-
include_dirs += [ "${chip_root}/examples/platform/nxp/k32w0" ]
33+
include_dirs += [ "${nxp_sdk_matter_support_root}/examples/platform/k32w0" ]
3434

3535
if (is_clang) {
3636
cflags = [ "-Wno-format-nonliteral" ]
@@ -46,7 +46,7 @@ config("openthread_k32w0_config") {
4646

4747
source_set("openthread_core_config_k32w0") {
4848
sources = [
49-
"${chip_root}/examples/platform/nxp/k32w0/app/project_include/OpenThreadConfig.h",
49+
"${nxp_sdk_matter_support_root}/examples/platform/k32w0/app/project_include/OpenThreadConfig.h",
5050
"${openthread_nxp_root}/src/k32w0/k32w061/openthread-core-k32w061-config-check.h",
5151
]
5252

0 commit comments

Comments
 (0)