Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ipv4 build arg moved and update data modal for lighting app #25591

Merged
merged 2 commits into from
Mar 10, 2023
Merged

ipv4 build arg moved and update data modal for lighting app #25591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7be0a1b
ipv4 build arg moved and update data modal for lighting app
Thirsrin Mar 9, 2023
5b89672
review comments
Thirsrin Mar 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions examples/lighting-app/silabs/SiWx917/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@ declare_args() {
sl_wfx_config_softap = false
sl_wfx_config_scan = true

# Argument to Disable IPv4 for wifi(rs911)
chip_enable_wifi_ipv4 = false

# Argument to force enable WPA3 security on rs91x
rs91x_wpa3_only = false

Expand Down
3 changes: 2 additions & 1 deletion examples/lighting-app/silabs/efr32/build_for_wifi_args.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ chip_enable_openthread = false
import("${chip_root}/src/platform/silabs/efr32/wifi_args.gni")

chip_enable_ota_requestor = true
app_data_model = "${chip_root}/examples/lighting-app/lighting-common"
app_data_model =
"${chip_root}/examples/lighting-app/silabs/efr32/data_model:silabs-lighting"
3 changes: 0 additions & 3 deletions examples/platform/silabs/efr32/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ declare_args() {
sl_wfx_config_softap = false
sl_wfx_config_scan = true

# Argument to Disable IPv4 for wifi(rs911)
chip_enable_wifi_ipv4 = false

# Argument to force enable WPA3 security on rs91x
rs91x_wpa3_only = false

Expand Down
7 changes: 7 additions & 0 deletions third_party/silabs/SiWx917_sdk.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ declare_args() {

# Enable Segger System View
use_system_view = false

# Argument to Disable IPv4 for wifi(rs911)
chip_enable_wifi_ipv4 = false
}

assert(efr32_sdk_root != "", "efr32_sdk_root must be specified")
Expand Down Expand Up @@ -141,6 +144,10 @@ template("efr32_sdk") {

defines += board_defines

if (chip_enable_wifi_ipv4) {
defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4=1" ]
}

# Enabling led interface
if (use_wstk_leds) {
defines += [ "ENABLE_WSTK_LEDS" ]
Expand Down
6 changes: 6 additions & 0 deletions third_party/silabs/efr32_sdk.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ declare_args() {

# Enable Sleepy end device
enable_sleepy_device = false

# Argument to Disable IPv4 for wifi(rs911)
chip_enable_wifi_ipv4 = false
}

assert(efr32_sdk_root != "", "efr32_sdk_root must be specified")
Expand Down Expand Up @@ -197,6 +200,9 @@ template("efr32_sdk") {
}

if (defined(invoker.chip_enable_wifi) && invoker.chip_enable_wifi) {
if (chip_enable_wifi_ipv4) {
defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4=1" ]
}
if (use_rs9116 || use_SiWx917) {
defines += [
"SL_HEAP_SIZE=32768",
Expand Down