Skip to content

Commit 40c8298

Browse files
hicklinhicklin
committed
Merge branch 'master' into update_service_area_xml_from_07. Fixed XML confilct and regenerated code.
2 parents 95c68f7 + 587665d commit 40c8298

File tree

181 files changed

+9830
-2497
lines changed

Some content is hidden

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

181 files changed

+9830
-2497
lines changed

‎.github/workflows/qemu.yaml

+2-7
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ concurrency:
2727

2828
env:
2929
CHIP_NO_LOG_TIMESTAMPS: true
30-
30+
3131
jobs:
3232

3333
qemu-esp32:
@@ -75,12 +75,7 @@ jobs:
7575
name: Tizen
7676

7777
runs-on: ubuntu-latest
78-
# NOTE: job temporarely disabled as it seems flaky. The flake does not result in usable
79-
# logs so the current theory is that we run out of space. This is unusual as
80-
# larger docker images succeed at bootstrap, however it needs more investigation
81-
# to detect an exact/real root cause.
82-
if: false
83-
# if: github.actor != 'restyled-io[bot]'
78+
if: github.actor != 'restyled-io[bot]'
8479

8580
container:
8681
image: ghcr.io/project-chip/chip-build-tizen-qemu:54

‎.restyled.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ 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/**/*"
7675
- "examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/zap-generated/*" # zap-generated files
7776
- "integrations/cloudbuild/*.yaml" # uglier long command line content
7877
- "scripts/run_codegen_targets.sh" # shellharden breaks for loops over command outputs

‎BUILD.gn

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

690690
if (enable_k32w_lighting_app_build) {
691691
group("k32w_lighting_app") {
692-
deps = [ "${chip_root}/examples/lighting-app/nxp/k32w/k32w0/(${chip_root}/config/k32w/toolchain:k32w_lighting_app)" ]
692+
deps = [ "${chip_root}/examples/lighting-app/nxp/k32w0/(${chip_root}/config/k32w/toolchain:k32w_lighting_app)" ]
693693
}
694694

695695
extra_build_deps += [ ":k32w_lighting_app" ]
696696
}
697697

698698
if (enable_k32w_lock_app_build) {
699699
group("k32w_lock_app") {
700-
deps = [ "${chip_root}/examples/lock-app/nxp/k32w/k32w0/(${chip_root}/config/k32w/toolchain:k32w_lock_app)" ]
700+
deps = [ "${chip_root}/examples/lock-app/nxp/k32w0/(${chip_root}/config/k32w/toolchain:k32w_lock_app)" ]
701701
}
702702

703703
extra_build_deps += [ ":k32w_lock_app" ]
704704
}
705705

706706
if (enable_k32w_shell_app_build) {
707707
group("k32w_shell_app") {
708-
deps = [ "${chip_root}/examples/shell/nxp/k32w/k32w0/(${chip_root}/config/k32w/toolchain:k32w_shell_app)" ]
708+
deps = [ "${chip_root}/examples/shell/nxp/k32w0/(${chip_root}/config/k32w/toolchain:k32w_shell_app)" ]
709709
}
710710

711711
extra_build_deps += [ ":k32w_shell_app" ]

‎build/config/compiler/BUILD.gn

+6-1
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,11 @@ config("warnings_third_party") {
334334
}
335335

336336
config("symbols_default") {
337-
cflags = [ "-g${symbol_level}" ]
337+
if (strip_symbols) {
338+
cflags = [ "-s" ]
339+
} else {
340+
cflags = [ "-g${symbol_level}" ]
341+
}
338342
}
339343

340344
config("std_default") {
@@ -489,6 +493,7 @@ config("libfuzzer_fuzzing") {
489493

490494
config("oss_fuzz") {
491495
cflags = string_split(getenv("CFLAGS"))
496+
cflags_cc = string_split(getenv("CXXFLAGS"))
492497
ldflags = string_split(getenv("CXXFLAGS"))
493498
ldflags += [ getenv("LIB_FUZZING_ENGINE") ]
494499
}

‎build/config/compiler/compiler.gni

+6-3
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ declare_args() {
3030
symbol_level = 2
3131

3232
# Enable position independent code (-fPIC).
33-
enable_pic =
34-
current_os == "linux" || current_os == "mac" || current_os == "android"
33+
enable_pic = current_os == "linux" || current_os == "mac" ||
34+
current_os == "android" || current_os == "tizen"
3535

3636
# Enable position independent executables (-pie).
37-
enable_pie = current_os == "linux"
37+
enable_pie = current_os == "linux" || current_os == "tizen"
3838

3939
# Remove unwind tables from the binary to save space.
4040
exclude_unwind_tables = current_os != "android"
@@ -48,6 +48,9 @@ declare_args() {
4848
# enable libfuzzer
4949
is_libfuzzer = false
5050

51+
# Remove all symbol table and relocation information from the binary.
52+
strip_symbols = false
53+
5154
# Generate code coverage analysis artifacts when enabled.
5255
use_coverage = false
5356

‎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/k32w/k32w0/args.gni")
23+
import("${chip_root}/examples/lighting-app/nxp/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/k32w/k32w0/args.gni")
30+
import("${chip_root}/examples/lock-app/nxp/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/k32w/k32w0/args.gni")
37+
import("${chip_root}/examples/contact-sensor-app/nxp/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/k32w/k32w0/args.gni")
44+
import("${chip_root}/examples/shell/nxp/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/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. |
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. |
2424

2525
## Controllers
2626

0 commit comments

Comments
 (0)