Skip to content

Commit 134b914

Browse files
Martin-NXPMartin-NXP
committed
Revert "[nxp fromtree] [NXP] Update k32w0 folder structure (project-chip#34772)"
This reverts commit 7f1f2df. Signed-off-by: Martin Girardot <martin.girardot@nxp.com>
1 parent d8b1fdf commit 134b914

File tree

147 files changed

+2332
-5306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+2332
-5306
lines changed

‎.restyled.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ exclude:
7272
- "scripts/tools/zap/tests/outputs/**/*" # Matches generated output 1:1
7373
- "examples/chef/sample_app_util/test_files/*.yaml"
7474
- "examples/chef/zzz_generated/**/*"
75+
- "examples/platform/nxp/k32w/k32w0/scripts/demo_generated_certs/**/*"
7576
- "examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/*" # zap-generated files
7677
- "integrations/cloudbuild/*.yaml" # uglier long command line content
7778
- "scripts/run_codegen_targets.sh" # shellharden breaks for loops over command outputs

‎BUILD.gn

+3-3
Original file line numberDiff line numberDiff line change
@@ -683,23 +683,23 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
683683

684684
if (enable_k32w_lighting_app_build) {
685685
group("k32w_lighting_app") {
686-
deps = [ "${chip_root}/examples/lighting-app/nxp/k32w0/(${chip_root}/config/k32w/toolchain:k32w_lighting_app)" ]
686+
deps = [ "${chip_root}/examples/lighting-app/nxp/k32w/k32w0/(${chip_root}/config/k32w/toolchain:k32w_lighting_app)" ]
687687
}
688688

689689
extra_build_deps += [ ":k32w_lighting_app" ]
690690
}
691691

692692
if (enable_k32w_lock_app_build) {
693693
group("k32w_lock_app") {
694-
deps = [ "${chip_root}/examples/lock-app/nxp/k32w0/(${chip_root}/config/k32w/toolchain:k32w_lock_app)" ]
694+
deps = [ "${chip_root}/examples/lock-app/nxp/k32w/k32w0/(${chip_root}/config/k32w/toolchain:k32w_lock_app)" ]
695695
}
696696

697697
extra_build_deps += [ ":k32w_lock_app" ]
698698
}
699699

700700
if (enable_k32w_shell_app_build) {
701701
group("k32w_shell_app") {
702-
deps = [ "${chip_root}/examples/shell/nxp/k32w0/(${chip_root}/config/k32w/toolchain:k32w_shell_app)" ]
702+
deps = [ "${chip_root}/examples/shell/nxp/k32w/k32w0/(${chip_root}/config/k32w/toolchain:k32w_shell_app)" ]
703703
}
704704

705705
extra_build_deps += [ ":k32w_shell_app" ]

‎config/k32w/toolchain/BUILD.gn

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,27 @@ import("${build_root}/toolchain/arm_gcc/arm_toolchain.gni")
2020
arm_toolchain("k32w_lighting_app") {
2121
toolchain_args = {
2222
current_os = "freertos"
23-
import("${chip_root}/examples/lighting-app/nxp/k32w0/args.gni")
23+
import("${chip_root}/examples/lighting-app/nxp/k32w/k32w0/args.gni")
2424
}
2525
}
2626

2727
arm_toolchain("k32w_lock_app") {
2828
toolchain_args = {
2929
current_os = "freertos"
30-
import("${chip_root}/examples/lock-app/nxp/k32w0/args.gni")
30+
import("${chip_root}/examples/lock-app/nxp/k32w/k32w0/args.gni")
3131
}
3232
}
3333

3434
arm_toolchain("k32w_contact_sensor_app") {
3535
toolchain_args = {
3636
current_os = "freertos"
37-
import("${chip_root}/examples/contact-sensor-app/nxp/k32w0/args.gni")
37+
import("${chip_root}/examples/contact-sensor-app/nxp/k32w/k32w0/args.gni")
3838
}
3939
}
4040

4141
arm_toolchain("k32w_shell_app") {
4242
toolchain_args = {
4343
current_os = "freertos"
44-
import("${chip_root}/examples/shell/nxp/k32w0/args.gni")
44+
import("${chip_root}/examples/shell/nxp/k32w/k32w0/args.gni")
4545
}
4646
}

‎docs/QUICK_START.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ and platforms.
1717
Use one of the controllers listed above and then a Border Router and Node
1818
combination listed below.
1919

20-
| <div style="width:200px">Border Router</div> | <div style="width:200px">Node</div> | Description |
21-
| -------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
22-
| [**ot-br**](https://openthread.io/guides/border-router/build)<br>Thread Border Router <li>RasPi <li>BeagleBone | **lighting-app** <li>[Nordic nRF5x](https://github.com/project-chip/connectedhomeip/tree/master/examples/lighting-app/nrfconnect/README.md) <li> [NXP K32W](https://github.com/project-chip/connectedhomeip/tree/master/examples/lighting-app/nxp/k32w0/README.md) <li> [Qorvo QPG6100](https://github.com/project-chip/connectedhomeip/tree/master/examples/lighting-app/qpg) <li> [Silicon Labs EFR32](https://github.com/project-chip/connectedhomeip/tree/master/examples/lighting-app/silabs/README.md) | The Lighting example is supported by many of the available Thread platforms. See the chip-tool controller instructions for how to actuate the light on/off cluster. |
23-
| [**ot-br**](https://openthread.io/guides/border-router/build)<br>Thread Border Router <li>RasPi <li>BeagleBone | **lock-app** <li>[Nordic nRF5x](https://github.com/project-chip/connectedhomeip/tree/master/examples/lock-app/nrfconnect/README.md) <li> [Qorvo QPG6100](https://github.com/project-chip/connectedhomeip/tree/master/examples/lock-app/qpg) <li> [Silicon Labs EFR32](https://github.com/project-chip/connectedhomeip/tree/master/examples/lock-app/efr32/README.md) <li> [TI CC13x2x7](https://github.com/project-chip/connectedhomeip/tree/master/examples/lock-app/cc13x2x7_26x2x7/README.md) | The Lock example is supported by many of the available Thread and Wi-Fi platforms. |
20+
| <div style="width:200px">Border Router</div> | <div style="width:200px">Node</div> | Description |
21+
| -------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
22+
| [**ot-br**](https://openthread.io/guides/border-router/build)<br>Thread Border Router <li>RasPi <li>BeagleBone | **lighting-app** <li>[Nordic nRF5x](https://github.com/project-chip/connectedhomeip/tree/master/examples/lighting-app/nrfconnect/README.md) <li> [NXP K32W](https://github.com/project-chip/connectedhomeip/tree/master/examples/lighting-app/nxp/k32w/k32w0/README.md) <li> [Qorvo QPG6100](https://github.com/project-chip/connectedhomeip/tree/master/examples/lighting-app/qpg) <li> [Silicon Labs EFR32](https://github.com/project-chip/connectedhomeip/tree/master/examples/lighting-app/silabs/README.md) | The Lighting example is supported by many of the available Thread platforms. See the chip-tool controller instructions for how to actuate the light on/off cluster. |
23+
| [**ot-br**](https://openthread.io/guides/border-router/build)<br>Thread Border Router <li>RasPi <li>BeagleBone | **lock-app** <li>[Nordic nRF5x](https://github.com/project-chip/connectedhomeip/tree/master/examples/lock-app/nrfconnect/README.md) <li> [NXP K32W](https://github.com/project-chip/connectedhomeip/tree/master/examples/lock-app/nxp/k32w/k32w0/README.md) <li> [Qorvo QPG6100](https://github.com/project-chip/connectedhomeip/tree/master/examples/lock-app/qpg) <li> [Silicon Labs EFR32](https://github.com/project-chip/connectedhomeip/tree/master/examples/lock-app/efr32/README.md) <li> [TI CC13x2x7](https://github.com/project-chip/connectedhomeip/tree/master/examples/lock-app/cc13x2x7_26x2x7/README.md) | The Lock example is supported by many of the available Thread and Wi-Fi platforms. |
2424

2525
## Controllers
2626

‎docs/guides/nxp/nxp_k32w0_ota_guide.md

-232
This file was deleted.

0 commit comments

Comments
 (0)