Skip to content

Commit

Permalink
addresses PR comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmartinez-silabs
jmartinez-silabs committed Aug 15, 2022
1 parent c992266 commit c3355cf
Show file tree
Hide file tree
Showing 24 changed files with 29 additions and 52 deletions.
2 changes: 0 additions & 2 deletions examples/chef/efr32/.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,5 @@ default_args = {
target_cpu = "arm"
target_os = "freertos"
chip_openthread_ftd = true
openthread_external_platform =
"${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
import("//args.gni")
}
6 changes: 1 addition & 5 deletions examples/chef/efr32/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,13 +206,9 @@ efr32_executable("chef_app") {
# OpenThread Settings
if (chip_enable_openthread) {
deps += [
"${chip_root}/third_party/openthread:openthread_device_deps",
"${chip_root}/third_party/openthread:openthread",
"${examples_plat_dir}:efr-matter-shell",
]

if (enable_openthread_cli) {
deps += [ "${efr32_sdk_build_root}:openthread_cli" ]
}
}

if (chip_enable_ota_requestor) {
Expand Down
2 changes: 2 additions & 0 deletions examples/chef/efr32/args.gni
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
chip_enable_openthread = true
openthread_external_platform =
"${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
2 changes: 0 additions & 2 deletions examples/light-switch-app/efr32/.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,5 @@ default_args = {
target_cpu = "arm"
target_os = "freertos"
chip_openthread_ftd = true
openthread_external_platform =
"${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
import("//args.gni")
}
6 changes: 1 addition & 5 deletions examples/light-switch-app/efr32/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,13 +199,9 @@ efr32_executable("light_switch_app") {
# OpenThread Settings
if (chip_enable_openthread) {
deps += [
"${chip_root}/third_party/openthread:openthread_device_deps",
"${chip_root}/third_party/openthread:openthread",
"${examples_plat_dir}:efr-matter-shell",
]

if (enable_openthread_cli) {
deps += [ "${efr32_sdk_build_root}:openthread_cli" ]
}
}

# Attestation Credentials
Expand Down
2 changes: 2 additions & 0 deletions examples/light-switch-app/efr32/args.gni
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
chip_enable_openthread = true
pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
openthread_external_platform =
"${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
2 changes: 0 additions & 2 deletions examples/lighting-app/efr32/.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,5 @@ default_args = {
target_cpu = "arm"
target_os = "freertos"
chip_openthread_ftd = true
openthread_external_platform =
"${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
import("//args.gni")
}
5 changes: 1 addition & 4 deletions examples/lighting-app/efr32/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,13 +204,10 @@ efr32_executable("lighting_app") {
# OpenThread Settings
if (chip_enable_openthread) {
deps += [
"${chip_root}/third_party/openthread:openthread_device_deps",
"${chip_root}/third_party/openthread:openthread",
"${examples_plat_dir}:efr-matter-shell",
]

if (enable_openthread_cli) {
deps += [ "${efr32_sdk_build_root}:openthread_cli" ]
}
}

if (chip_enable_ota_requestor) {
Expand Down
3 changes: 3 additions & 0 deletions examples/lighting-app/efr32/args.gni
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
chip_enable_openthread = true
pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"

openthread_external_platform =
"${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
2 changes: 0 additions & 2 deletions examples/lock-app/efr32/.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,5 @@ default_args = {
target_cpu = "arm"
target_os = "freertos"
chip_openthread_ftd = true
openthread_external_platform =
"${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
import("//args.gni")
}
6 changes: 1 addition & 5 deletions examples/lock-app/efr32/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,13 +201,9 @@ efr32_executable("lock_app") {
# OpenThread Settings
if (chip_enable_openthread) {
deps += [
"${chip_root}/third_party/openthread:openthread_device_deps",
"${chip_root}/third_party/openthread:openthread",
"${examples_plat_dir}:efr-matter-shell",
]

if (enable_openthread_cli) {
deps += [ "${efr32_sdk_build_root}:openthread_cli" ]
}
}

if (chip_enable_ota_requestor) {
Expand Down
2 changes: 2 additions & 0 deletions examples/lock-app/efr32/args.gni
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ chip_enable_openthread = true
pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
openthread_external_platform =
"${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
2 changes: 1 addition & 1 deletion examples/platform/efr32/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ source_set("openthread_core_config_efr32_chip_examples") {

public_deps = [ "${efr32_sdk_build_root}:efr32_sdk" ]

if (use_silabs_thread_lib == true) {
if (use_silabs_thread_lib) {
public_deps += [ "${efr32_sdk_build_root}:openthread_core_config_efr32" ]
} else {
public_deps += [ "${chip_root}/third_party/openthread/platforms/efr32:openthread_core_config_efr32" ]
Expand Down
6 changes: 1 addition & 5 deletions examples/thermostat/efr32/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,13 +195,9 @@ efr32_executable("thermostat_app") {
# OpenThread Settings
if (chip_enable_openthread) {
deps += [
"${chip_root}/third_party/openthread:openthread_device_deps",
"${chip_root}/third_party/openthread:openthread",
"${examples_plat_dir}:efr-matter-shell",
]

if (enable_openthread_cli) {
deps += [ "${efr32_sdk_build_root}:openthread_cli" ]
}
}

# Attestation Credentials
Expand Down
2 changes: 0 additions & 2 deletions examples/window-app/efr32/.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,5 @@ default_args = {
target_cpu = "arm"
target_os = "freertos"
chip_openthread_ftd = true
openthread_external_platform =
"${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
import("//args.gni")
}
6 changes: 1 addition & 5 deletions examples/window-app/efr32/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,13 +187,9 @@ efr32_executable("window_app") {
# OpenThread Settings
if (chip_enable_openthread) {
deps += [
"${chip_root}/third_party/openthread:openthread_device_deps",
"${chip_root}/third_party/openthread:openthread",
"${examples_plat_dir}:efr-matter-shell",
]

if (enable_openthread_cli) {
deps += [ "${efr32_sdk_build_root}:openthread_cli" ]
}
}

if (chip_enable_ota_requestor) {
Expand Down
2 changes: 2 additions & 0 deletions examples/window-app/efr32/args.gni
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ chip_enable_ota_requestor = true
pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
chip_enable_openthread = true
openthread_external_platform =
"${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
2 changes: 1 addition & 1 deletion src/inet/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ static_library("inet") {

if (chip_system_config_use_open_thread_inet_endpoints) {
public_deps +=
[ "${chip_root}/third_party/openthread:openthread_device_deps" ]
[ "${chip_root}/third_party/openthread:openthread" ]
}

if (chip_inet_config_enable_tcp_endpoint) {
Expand Down
4 changes: 3 additions & 1 deletion src/platform/EFR32/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,9 @@ static_library("EFR32") {
]
if (chip_enable_openthread) {
public_deps +=
[ "${chip_root}/third_party/openthread:openthread_device_deps" ]
[ "${chip_root}/third_party/openthread:openthread" ]

deps += [ "${chip_root}/third_party/silabs:openthread_cli" ]

sources += [
"../OpenThread/OpenThreadUtils.cpp",
Expand Down
2 changes: 0 additions & 2 deletions src/test_driver/efr32/.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,5 @@ check_system_includes = true
default_args = {
target_cpu = "arm"
target_os = "freertos"
openthread_external_platform =
"${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
import("//args.gni")
}
6 changes: 1 addition & 5 deletions src/test_driver/efr32/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,9 @@ efr32_executable("efr32_device_tests") {
# OpenThread Settings
if (chip_enable_openthread) {
deps += [
"${chip_root}/third_party/openthread:openthread_device_deps",
"${chip_root}/third_party/openthread:openthread",
"${examples_plat_dir}:efr-matter-shell",
]

if (enable_openthread_cli) {
deps += [ "${efr32_sdk_build_root}:openthread_cli" ]
}
}

deps += pw_build_LINK_DEPS
Expand Down
3 changes: 3 additions & 0 deletions src/test_driver/efr32/args.gni
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ chip_enable_openthread = true
chip_openthread_ftd = true
chip_monolithic_tests = true

openthread_external_platform =
"${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"

#Fix me : Test driver should use same config as examples
# Problem : Linker issue if set to true
chip_system_config_use_open_thread_inet_endpoints = false
Expand Down
2 changes: 1 addition & 1 deletion third_party/openthread/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ declare_args() {
chip_openthread_target = ""
}

group("openthread_device_deps") {
group("openthread") {
if (chip_openthread_target != "") {
public_deps = [ chip_openthread_target ]
} else {
Expand Down
4 changes: 2 additions & 2 deletions third_party/silabs/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ group("efr32_sdk") {

if (chip_enable_openthread) {
group("openthread_cli") {
if (use_silabs_thread_lib == false) {
if (!use_silabs_thread_lib) {
if (chip_openthread_ftd) {
public_deps = [ "${sl_openthread_root}:libopenthread-cli-ftd" ]
} else {
Expand Down Expand Up @@ -151,7 +151,7 @@ if (use_silabs_thread_lib) {

# selected thread device type FTD or MTD
XTD = "ftd"
if (chip_openthread_ftd == false) {
if (!chip_openthread_ftd) {
XTD = "mtd"
}

Expand Down

0 comments on commit c3355cf

Please sign in to comment.