reverting due to unwanted changes to third party repos

abpoth · Aug 28, 2023 · 32db844 · 32db844
1 parent eddd8a1
commit 32db844
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/third_party/silabs/SiWx917_sdk.gni b/third_party/silabs/SiWx917_sdk.gni
@@ -44,7 +44,6 @@ template("siwx917_sdk") {
 
     # Treat these includes as system includes, so warnings in them are not fatal.
     _include_dirs = [
-      "${chip_root}",
       "${chip_root}/examples/platform/silabs/SiWx917/SiWx917",
       "${sdk_support_root}/matter/si91x/siwx917/BRD4325x/support/hal",
       "${efr32_sdk_root}/platform/emdrv/nvm3/inc",
@@ -238,6 +237,10 @@ template("siwx917_sdk") {
       defines += [ "DIC_ENABLE=1" ]
     }
 
+    if (aws_sdk_ota) {
+      defines += [ "ENABLE_AWS_OTA_FEAT=1" ]
+    }
+
     libs += [ "${sdk_support_root}/platform/emdrv/nvm3/lib/libnvm3_CM4_gcc.a" ]
 
     cflags = []

diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni
@@ -52,7 +52,7 @@ declare_args() {
   sl_ot_active_interval_ms = 200  # 200ms Active Intervals
 
   # ICD Matter Configuration flags
-  sl_idle_mode_interval_ms = 600000  # 10min Idle Mode Interval
+  sl_idle_mode_interval_s = 600  # 10min Idle Mode Interval
   sl_active_mode_interval_ms = 1000  # 1s Active Mode Interval
   sl_active_mode_threshold_ms = 500  # 500ms Active Mode Threshold
   sl_icd_supported_clients_per_fabric = 2  # 2 registration slots per fabric
@@ -352,7 +352,7 @@ template("efr32_sdk") {
         "SL_ICD_ENABLED=1",
         "SL_ACTIVE_MODE_THRESHOLD=${sl_active_mode_threshold_ms}",
         "SL_ACTIVE_MODE_INTERVAL=${sl_active_mode_interval_ms}",
-        "SL_IDLE_MODE_INTERVAL=${sl_idle_mode_interval_ms}",
+        "SL_IDLE_MODE_INTERVAL=${sl_idle_mode_interval_s}",
         "SL_ICD_SUPPORTED_CLIENTS_PER_FABRIC=${sl_icd_supported_clients_per_fabric}",
       ]
 
@@ -690,6 +690,10 @@ template("efr32_sdk") {
     if (enable_dic) {
       sources += [
         "${chip_root}/third_party/silabs/mqtt/stack/mqtt.c",
+        "${efr32_sdk_root}/util/third_party/mbedtls/library/ctr_drbg.c",
+        "${efr32_sdk_root}/util/third_party/mbedtls/library/entropy.c",
+        "${efr32_sdk_root}/util/third_party/mbedtls/library/entropy_poll.c",
+        "${efr32_sdk_root}/util/third_party/mbedtls/library/rsa.c",
         "${efr32_sdk_root}/util/third_party/mbedtls/library/rsa_alt_helpers.c",
       ]
     }