fixes required to use GSDK lwip

project-chip · Mar 21, 2023 · 623f709 · 623f709
1 parent e7fb3c3
commit 623f709
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 18 deletions.
diff --git a/examples/light-switch-app/silabs/SiWx917/BUILD.gn b/examples/light-switch-app/silabs/SiWx917/BUILD.gn
@@ -42,7 +42,7 @@ declare_args() {
   chip_print_memory_usage = false
 }
 
-efr32_sdk("sdk") {
+siwx917_sdk("sdk") {
   sources = [
     "${efr32_project_dir}/include/CHIPProjectConfig.h",
     "${examples_plat_dir}/FreeRTOSConfig.h",

diff --git a/examples/lighting-app/silabs/SiWx917/BUILD.gn b/examples/lighting-app/silabs/SiWx917/BUILD.gn
@@ -41,7 +41,7 @@ declare_args() {
   chip_print_memory_usage = false
 }
 
-efr32_sdk("sdk") {
+siwx917_sdk("sdk") {
   sources = [
     "${efr32_project_dir}/include/CHIPProjectConfig.h",
     "${examples_plat_dir}/FreeRTOSConfig.h",

diff --git a/examples/lock-app/silabs/SiWx917/BUILD.gn b/examples/lock-app/silabs/SiWx917/BUILD.gn
@@ -41,7 +41,7 @@ declare_args() {
   chip_print_memory_usage = false
 }
 
-efr32_sdk("sdk") {
+siwx917_sdk("sdk") {
   sources = [
     "${efr32_project_dir}/include/CHIPProjectConfig.h",
     "${examples_plat_dir}/FreeRTOSConfig.h",

diff --git a/examples/window-app/silabs/SiWx917/BUILD.gn b/examples/window-app/silabs/SiWx917/BUILD.gn
@@ -35,7 +35,7 @@ declare_args() {
   chip_print_memory_usage = false
 }
 
-efr32_sdk("sdk") {
+siwx917_sdk("sdk") {
   sources = [
     "${efr32_project_dir}/include/CHIPProjectConfig.h",
     "${examples_plat_dir}/FreeRTOSConfig.h",

diff --git a/src/platform/silabs/SiWx917/args.gni b/src/platform/silabs/SiWx917/args.gni
@@ -31,6 +31,9 @@ chip_crypto = "platform"
 # examples/platform/efr32/EFR32DeviceDataProvider is now used.
 chip_use_transitional_commissionable_data_provider = false
 
+# Use GSDK lwip instead of CHIP
+lwip_root = "${efr32_sdk_build_root}"
+
 #lwip_platform = "external"
 lwip_platform = "silabs"
 lwip_ipv6 = true

diff --git a/third_party/silabs/SiWx917_sdk.gni b/third_party/silabs/SiWx917_sdk.gni
@@ -16,34 +16,22 @@ import("//build_overrides/chip.gni")
 import("//build_overrides/efr32_sdk.gni")
 import("//build_overrides/jlink.gni")
 import("//build_overrides/mbedtls.gni")
+import("${efr32_sdk_build_root}/efr32_sdk.gni")
 
 import("${chip_root}/src/lib/lib.gni")
 import("silabs_board.gni")
 
 declare_args() {
-  sdk_support_root = "${chip_root}/third_party/silabs/matter_support"
-  wisemcu_sdk_root = "${chip_root}/third_party/silabs/wiseconnect-wifi-bt-sdk"
   wisemcu_sdk_root = "${chip_root}/third_party/silabs/wisemcu-wifi-bt-sdk"
   examples_plat_dir = "${chip_root}/examples/platform/silabs/SiWx917"
-
-  kvs_max_entries = 255
-
-  # Use Silabs factory data provider example.
-  # Users can implement their own.
-  use_efr32_factory_data_provider = true
-
-  silabs_log_enabled = true
-
-  # Argument to Disable IPv4 for wifi(rs911)
-  chip_enable_wifi_ipv4 = false
 }
 
 # Defines an siwx917 SDK build target.
 #
 # Parameters:
 #   wisemcu_sdk_root - The location of the wisemcu SDK.
 #   sources - The sources files to build.
-template("efr32_sdk") {
+template("siwx917_sdk") {
   sdk_target_name = target_name
 
   config("${sdk_target_name}_config") {