From 7be0a1b5a1f71d61c2bec2351529315083a02311 Mon Sep 17 00:00:00 2001
From: thirupathi <ths@silabs.com>
Date: Thu, 9 Mar 2023 18:46:00 +0530
Subject: [PATCH 1/2] ipv4 build arg moved and update data modal for lighting
 app

---
 examples/lighting-app/silabs/SiWx917/BUILD.gn              | 3 ---
 examples/lighting-app/silabs/efr32/build_for_wifi_args.gni | 3 ++-
 examples/platform/silabs/efr32/BUILD.gn                    | 3 ---
 third_party/silabs/SiWx917_sdk.gni                         | 4 ++++
 third_party/silabs/efr32_sdk.gni                           | 3 +++
 third_party/silabs/silabs_board.gni                        | 3 +++
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/examples/lighting-app/silabs/SiWx917/BUILD.gn b/examples/lighting-app/silabs/SiWx917/BUILD.gn
index 6992933adc7c98..5c37fbd1cff151 100644
--- a/examples/lighting-app/silabs/SiWx917/BUILD.gn
+++ b/examples/lighting-app/silabs/SiWx917/BUILD.gn
@@ -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
 
diff --git a/examples/lighting-app/silabs/efr32/build_for_wifi_args.gni b/examples/lighting-app/silabs/efr32/build_for_wifi_args.gni
index 6f8812e9e4265f..c5097d7c1f5510 100644
--- a/examples/lighting-app/silabs/efr32/build_for_wifi_args.gni
+++ b/examples/lighting-app/silabs/efr32/build_for_wifi_args.gni
@@ -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"
diff --git a/examples/platform/silabs/efr32/BUILD.gn b/examples/platform/silabs/efr32/BUILD.gn
index 61952b05429073..427e7780957c06 100644
--- a/examples/platform/silabs/efr32/BUILD.gn
+++ b/examples/platform/silabs/efr32/BUILD.gn
@@ -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
 
diff --git a/third_party/silabs/SiWx917_sdk.gni b/third_party/silabs/SiWx917_sdk.gni
index 56ddd6f889019b..2f0fda3bc66303 100644
--- a/third_party/silabs/SiWx917_sdk.gni
+++ b/third_party/silabs/SiWx917_sdk.gni
@@ -141,6 +141,10 @@ template("efr32_sdk") {
 
     defines += board_defines
 
+    if (invoker.chip_enable_wifi_ipv4) {
+      defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4=1" ]
+    }
+
     # Enabling led interface
     if (use_wstk_leds) {
       defines += [ "ENABLE_WSTK_LEDS" ]
diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni
index 1d8a98ddd15c6d..3c5eaef13fc4d5 100644
--- a/third_party/silabs/efr32_sdk.gni
+++ b/third_party/silabs/efr32_sdk.gni
@@ -197,6 +197,9 @@ template("efr32_sdk") {
     }
 
     if (defined(invoker.chip_enable_wifi) && invoker.chip_enable_wifi) {
+      if (invoker.chip_enable_wifi_ipv4) {
+        defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4=1" ]
+      }
       if (use_rs9116 || use_SiWx917) {
         defines += [
           "SL_HEAP_SIZE=32768",
diff --git a/third_party/silabs/silabs_board.gni b/third_party/silabs/silabs_board.gni
index e0b6106da27f8c..d88f5f56fe463c 100644
--- a/third_party/silabs/silabs_board.gni
+++ b/third_party/silabs/silabs_board.gni
@@ -36,6 +36,9 @@ declare_args() {
   use_SiWx917 = false
   use_rs911x_sockets = false
   chip_enable_ble_rs911x = false
+
+  # Argument to Disable IPv4 for wifi(rs911)
+  chip_enable_wifi_ipv4 = false
 }
 
 declare_args() {

From 5b896722aad00dde146c7ab974122c5a19d2f4c6 Mon Sep 17 00:00:00 2001
From: thirupathi <ths@silabs.com>
Date: Thu, 9 Mar 2023 20:38:16 +0530
Subject: [PATCH 2/2] review comments

---
 third_party/silabs/SiWx917_sdk.gni  | 5 ++++-
 third_party/silabs/efr32_sdk.gni    | 5 ++++-
 third_party/silabs/silabs_board.gni | 3 ---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/third_party/silabs/SiWx917_sdk.gni b/third_party/silabs/SiWx917_sdk.gni
index 2f0fda3bc66303..d0f38b76af8510 100644
--- a/third_party/silabs/SiWx917_sdk.gni
+++ b/third_party/silabs/SiWx917_sdk.gni
@@ -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")
@@ -141,7 +144,7 @@ template("efr32_sdk") {
 
     defines += board_defines
 
-    if (invoker.chip_enable_wifi_ipv4) {
+    if (chip_enable_wifi_ipv4) {
       defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4=1" ]
     }
 
diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni
index 3c5eaef13fc4d5..2534003f6be96c 100644
--- a/third_party/silabs/efr32_sdk.gni
+++ b/third_party/silabs/efr32_sdk.gni
@@ -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")
@@ -197,7 +200,7 @@ template("efr32_sdk") {
     }
 
     if (defined(invoker.chip_enable_wifi) && invoker.chip_enable_wifi) {
-      if (invoker.chip_enable_wifi_ipv4) {
+      if (chip_enable_wifi_ipv4) {
         defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4=1" ]
       }
       if (use_rs9116 || use_SiWx917) {
diff --git a/third_party/silabs/silabs_board.gni b/third_party/silabs/silabs_board.gni
index d88f5f56fe463c..e0b6106da27f8c 100644
--- a/third_party/silabs/silabs_board.gni
+++ b/third_party/silabs/silabs_board.gni
@@ -36,9 +36,6 @@ declare_args() {
   use_SiWx917 = false
   use_rs911x_sockets = false
   chip_enable_ble_rs911x = false
-
-  # Argument to Disable IPv4 for wifi(rs911)
-  chip_enable_wifi_ipv4 = false
 }
 
 declare_args() {