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

[EFR32] Cleanup of script for WPA3 mode on RS91x to GN file #21669

Merged
merged 1 commit into from
Aug 5, 2022
Merged

[EFR32] Cleanup of script for WPA3 mode on RS91x to GN file #21669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions examples/light-switch-app/efr32/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ declare_args() {
chip_enable_wifi_ipv4 = false

# Argument to force enable WPA3 security
wifi_enable_security_wpa3 = false
rs91x_wpa3_only = false
}

declare_args() {
Expand Down Expand Up @@ -258,7 +258,8 @@ efr32_executable("light_switch_app") {
defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ]
}

if (wifi_enable_security_wpa3) {
if (rs91x_wpa3_only) {
# TODO: Change this macro once WF200 support is provided
defines += [ "WIFI_ENABLE_SECURITY_WPA3=1" ]
}
}
Expand Down
7 changes: 4 additions & 3 deletions examples/lighting-app/efr32/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ declare_args() {
# Argument to Disable IPv4 for wifi(rs911)
chip_enable_wifi_ipv4 = false

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

declare_args() {
Expand Down Expand Up @@ -258,7 +258,8 @@ efr32_executable("lighting_app") {
defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ]
}

if (wifi_enable_security_wpa3) {
if (rs91x_wpa3_only) {
# TODO: Change this macro once WF200 support is provided
defines += [ "WIFI_ENABLE_SECURITY_WPA3=1" ]
}
}
Expand Down
5 changes: 3 additions & 2 deletions examples/lock-app/efr32/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ declare_args() {
chip_enable_wifi_ipv4 = false

# Argument to force enable WPA3 security
wifi_enable_security_wpa3 = false
rs91x_wpa3_only = false
}

declare_args() {
Expand Down Expand Up @@ -255,7 +255,8 @@ efr32_executable("lock_app") {
defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ]
}

if (wifi_enable_security_wpa3) {
if (rs91x_wpa3_only) {
# TODO: Change this macro once WF200 support is provided
defines += [ "WIFI_ENABLE_SECURITY_WPA3=1" ]
}
}
Expand Down
5 changes: 3 additions & 2 deletions examples/window-app/efr32/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ declare_args() {
chip_enable_wifi_ipv4 = false

# Argument to force enable WPA3 security
wifi_enable_security_wpa3 = false
rs91x_wpa3_only = false
}

declare_args() {
Expand Down Expand Up @@ -241,7 +241,8 @@ efr32_executable("window_app") {
defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ]
}

if (wifi_enable_security_wpa3) {
if (rs91x_wpa3_only) {
# TODO: Change this macro once WF200 support is provided
defines += [ "WIFI_ENABLE_SECURITY_WPA3=1" ]
}
}
Expand Down
18 changes: 2 additions & 16 deletions scripts/examples/gn_efr32_example.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ if [ "$#" == "0" ]; then
Use to build the example with pigweed RPC
OTA_periodic_query_timeout
Periodic query timeout variable for OTA in seconds
rs91x_wpa3_only
Support for WPA3 only mode on RS91x
Presets
--sed
enable sleepy end device, set thread mtd
Expand Down Expand Up @@ -143,22 +145,6 @@ else
optArgs+="chip_enable_wifi_ipv4=true "
shift
;;
--rs91x_setSecurityType)
if [ -z "$2" ]; then
echo "--rs911x_setSecurityType requires WPA_WPA2 or WPA3_ONLY"
exit 1
fi
if [ "$2" = "WPA_WPA2" ]; then
optArgs+="wifi_enable_security_wpa3=false "
elif [ "$2" = "WPA3_ONLY" ]; then
optArgs+="wifi_enable_security_wpa3=true "
else
echo "Set security usage: --rs911x_setSecurityType WPA_WPA2|WPA3_ONLY"
exit 1
fi
shift
shift
;;
--additional_data_advertising)
optArgs+="chip_enable_additional_data_advertising=true chip_enable_rotating_device_id=true "
shift
Expand Down