Adds changes based on comments

project-chip · Nov 3, 2023 · 73fc998 · 73fc998
1 parent 9613cc9
commit 73fc998
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/examples/platform/silabs/efr32/BUILD.gn b/examples/platform/silabs/efr32/BUILD.gn
@@ -64,8 +64,7 @@ if (chip_enable_wifi) {
 
   if (use_rs9116) {
     import("rs911x/rs911x.gni")
-  }
-  if (use_SiWx917) {
+  } else if (use_SiWx917) {
     import("rs911x/rs9117.gni")
   }
   if (use_wf200) {

diff --git a/scripts/examples/gn_silabs_example.sh b/scripts/examples/gn_silabs_example.sh
@@ -227,6 +227,8 @@ else
                 ;;
             --docker)
                 optArgs+="efr32_sdk_root=\"$GSDK_ROOT\" "
+                optArgs+="wiseconnect_sdk_root=\"$WISECONNECT_SDK_ROOT\" "
+                optArgs+="wiseconnect_sdk_root=\"$WISECONNECT_SDK_ROOT\" "
                 USE_DOCKER=true
                 shift
                 ;;
@@ -322,14 +324,6 @@ else
         optArgs+="openthread_root=\"$GSDK_ROOT/util/third_party/openthread\" "
     fi
 
-    if [ "$USE_DOCKER" == true ] && [ "$USE_WIFI" == true ]; then
-        echo "Switching WiseConnect 2 SDK ROOT"
-        optArgs+="wiseconnect_sdk_root=\"$WISECONNECT_SDK_ROOT\" "
-
-        echo "Switching WiseConnect 3 SDK ROOT"
-        optArgs+="wifi_sdk_root=\"$WIFI_SDK_ROOT\" "
-    fi
-
     "$GN_PATH" gen --check --script-executable="$PYTHON_PATH" --fail-on-unused-args --export-compile-commands --root="$ROOT" --dotfile="$DOTFILE" --args="silabs_board=\"$SILABS_BOARD\" $optArgs" "$BUILD_DIR"
 
     if [ "$USE_SLC" == true ]; then