Skip to content

Commit 46667dc

Browse files
restyled-commitsMartin-NXP
authored andcommitted
Restyled by gn
1 parent f78dd33 commit 46667dc

File tree

5 files changed

+33
-26
lines changed
  • examples
  • src/platform/nxp/rt/rw61x
  • third_party/openthread/platforms/nxp/rt/rw61x

5 files changed

+33
-26
lines changed

examples/all-clusters-app/nxp/rt/rw61x/BUILD.gn

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ assert(target_os == "freertos")
3535
assert(nxp_platform == "rt/rw61x")
3636

3737
declare_args() {
38-
3938
# Allows to connect to a predefine Wi-Fi network at boot
4039
wifi_auto_connect_at_boot = false
4140
wifi_auto_connect_at_boot_ssid = ""
@@ -206,7 +205,8 @@ rt_executable("all_cluster_app") {
206205
}
207206

208207
if (wifi_auto_connect_at_boot) {
209-
assert(wifi_auto_connect_at_boot_ssid != "" && wifi_auto_connect_at_boot_password != "",
208+
assert(wifi_auto_connect_at_boot_ssid != "" &&
209+
wifi_auto_connect_at_boot_password != "",
210210
"WiFi SSID and password must be specified at build time!")
211211

212212
defines += [

examples/laundry-washer-app/nxp/rt/rw61x/BUILD.gn

+3-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ assert(target_os == "freertos")
3535
assert(nxp_platform == "rt/rw61x")
3636

3737
declare_args() {
38-
# Allows to connect to a predefine Wi-Fi network at boot
38+
# Allows to connect to a predefine Wi-Fi network at boot
3939
wifi_auto_connect_at_boot = false
4040
wifi_auto_connect_at_boot_ssid = ""
4141
wifi_auto_connect_at_boot_password = ""
@@ -210,7 +210,8 @@ rt_executable("laundry-washer") {
210210
}
211211

212212
if (wifi_auto_connect_at_boot) {
213-
assert(wifi_auto_connect_at_boot_ssid != "" && wifi_auto_connect_at_boot_password != "",
213+
assert(wifi_auto_connect_at_boot_ssid != "" &&
214+
wifi_auto_connect_at_boot_password != "",
214215
"WiFi SSID and password must be specified at build time!")
215216

216217
defines += [

examples/thermostat/nxp/rt/rw61x/BUILD.gn

+3-2
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ rt_sdk("sdk") {
105105
"CHIP_DEVICE_CONFIG_ENABLE_TBR=1",
106106
]
107107
}
108-
108+
109109
defines += [
110110
"CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR=${setup_discriminator}",
111111
]
@@ -223,7 +223,8 @@ rt_executable("thermostat") {
223223
}
224224

225225
if (wifi_auto_connect_at_boot) {
226-
assert(wifi_auto_connect_at_boot_ssid != "" && wifi_auto_connect_at_boot_password != "",
226+
assert(wifi_auto_connect_at_boot_ssid != "" &&
227+
wifi_auto_connect_at_boot_password != "",
227228
"WiFi SSID and password must be specified at build time!")
228229

229230
defines += [

src/platform/nxp/rt/rw61x/BUILD.gn

+21-16
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ source_set("nxp_ota") {
3434
}
3535

3636
config("nxp_platform_config") {
37-
defines = [ "EXTERNAL_BLEMANAGERIMPL_HEADER=\"platform/nxp/common/ble_zephyr/BLEManagerImpl.h\"", "CONFIG_BOOT_REASON_SDK_SUPPORT=1" ]
37+
defines = [
38+
"EXTERNAL_BLEMANAGERIMPL_HEADER=\"platform/nxp/common/ble_zephyr/BLEManagerImpl.h\"",
39+
"CONFIG_BOOT_REASON_SDK_SUPPORT=1",
40+
]
3841
include_dirs = [
3942
".",
4043
"../../common",
@@ -63,11 +66,12 @@ config("nxp_platform_config") {
6366
defines += [ "EXTERNAL_FACTORY_DATA_PROVIDER_IMPL_HEADER=\"platform/nxp/common/factory_data/FactoryDataProviderFwkImpl.h\"" ]
6467
}
6568
}
66-
# When OTBR is enabled Thread network commissioning cluster is enabled using chip_enable_secondary_nwk_if
67-
if (chip_enable_wifi && chip_enable_openthread && !chip_enable_secondary_nwk_if) {
69+
70+
# When OTBR is enabled Thread network commissioning cluster is enabled using chip_enable_secondary_nwk_if
71+
if (chip_enable_wifi && chip_enable_openthread &&
72+
!chip_enable_secondary_nwk_if) {
6873
defines += [ "_NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_" ]
6974
}
70-
7175
}
7276

7377
static_library("nxp_platform") {
@@ -155,31 +159,32 @@ static_library("nxp_platform") {
155159

156160
if (chip_enable_openthread) {
157161
sources += [
162+
# Temporary fix, to be revert once PR #34662 is merged, build issue when using GN check argument
163+
"${chip_root}/src/app/clusters/thread-border-router-management-server/thread-br-delegate.h",
164+
"../../../OpenThread/GenericThreadBorderRouterDelegate.cpp",
165+
"../../../OpenThread/GenericThreadBorderRouterDelegate.h",
158166
"../../../OpenThread/OpenThreadUtils.cpp",
159167
"../../common/ThreadStackManagerImpl.cpp",
160168
"../../common/ThreadStackManagerImpl.h",
161-
"../../../OpenThread/GenericThreadBorderRouterDelegate.cpp",
162-
"../../../OpenThread/GenericThreadBorderRouterDelegate.h",
163-
# Temporary fix, to be revert once PR #34662 is merged, build issue when using GN check argument
164-
"${chip_root}/src/app/clusters/thread-border-router-management-server/thread-br-delegate.h",
165169
]
166-
167-
deps += ["${chip_root}/src/app/common:ids",]
168-
170+
171+
deps += [ "${chip_root}/src/app/common:ids" ]
172+
169173
if (!nxp_build_matter_standalone_lib) {
170174
deps += [ "${chip_root}/third_party/openthread:openthread" ]
171-
public_deps += [ "${chip_root}/third_party/openthread:openthread-platform" ]
175+
public_deps +=
176+
[ "${chip_root}/third_party/openthread:openthread-platform" ]
172177
}
173178

174179
if (chip_mdns == "platform") {
175180
if (chip_enable_wifi) {
176-
sources += [
177-
"../../common/DnssdImpl.cpp",
178-
"../../common/DnssdImplBr.cpp",
179-
"../../common/DnssdImplBr.h",
181+
sources += [
180182
"../../../OpenThread/DnssdImpl.cpp",
181183
"../../../OpenThread/OpenThreadDnssdImpl.cpp",
182184
"../../../OpenThread/OpenThreadDnssdImpl.h",
185+
"../../common/DnssdImpl.cpp",
186+
"../../common/DnssdImplBr.cpp",
187+
"../../common/DnssdImplBr.h",
183188
]
184189
} else {
185190
sources += [

third_party/openthread/platforms/nxp/rt/rw61x/BUILD.gn

+4-4
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ config("openthread_rw61x_config") {
6161
"OPENTHREAD_CONFIG_BORDER_AGENT_EPHEMERAL_KEY_ENABLE=1",
6262
"OT_APP_BR_LWIP_HOOKS_EN=1",
6363
"OT_APP_CLI_EPHEMERAL_KEY_ADDON=1",
64-
"OT_APP_CLI_LWIP_ADDON=1"
64+
"OT_APP_CLI_LWIP_ADDON=1",
6565
]
6666
}
6767

@@ -86,6 +86,9 @@ source_set("libopenthread-rw61x") {
8686

8787
if (chip_enable_wifi && chip_enable_openthread) {
8888
sources += [
89+
"${openthread_nxp_root}/examples/utils/cli_addons/addons_cli.c",
90+
"${openthread_nxp_root}/examples/utils/cli_addons/ephemeral_key/ephemeral_key_cli.c",
91+
"${openthread_nxp_root}/examples/utils/cli_addons/lwip/lwip_cli.c",
8992
"${openthread_nxp_root}/src/common/br/border_agent.c",
9093
"${openthread_nxp_root}/src/common/br/br_rtos_manager.c",
9194
"${openthread_nxp_root}/src/common/br/infra_if.c",
@@ -94,9 +97,6 @@ source_set("libopenthread-rw61x") {
9497
"${openthread_nxp_root}/src/common/br/mdns_socket.c",
9598
"${openthread_nxp_root}/src/common/br/udp_plat.c",
9699
"${openthread_nxp_root}/src/common/br/utils.c",
97-
"${openthread_nxp_root}/examples/utils/cli_addons/addons_cli.c",
98-
"${openthread_nxp_root}/examples/utils/cli_addons/ephemeral_key/ephemeral_key_cli.c",
99-
"${openthread_nxp_root}/examples/utils/cli_addons/lwip/lwip_cli.c",
100100
]
101101
deps += [ "${nxp_sdk_build_root}:nxp_lwip" ]
102102
}

0 commit comments

Comments
 (0)