fix linking issue with thread coap lib

Author: jmartinez-silabs

examples/platform/silabs/efr32/project_include/OpenThreadConfig.h

@@ -45,7 +45,7 @@
 // Timeout after 2 missed checkin or 4 mins if sleep interval is too short.
 #define OPENTHREAD_CONFIG_MLE_CHILD_TIMEOUT_DEFAULT ((SL_MLE_TIMEOUT_s < 120) ? 240 : ((SL_MLE_TIMEOUT_s * 2) + 1))
 
-#if defined(SL_CSL_ENABLE) && SL_CSL_ENABLE
+#if defined(SL_CSL_ENABLE) && SL_CSL_ENABLE || SL_CONFIG_OPENTHREAD_LIB
 
 #define OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE 1
 #define OPENTHREAD_CONFIG_MAC_CSL_AUTO_SYNC_ENABLE 1
@@ -55,7 +55,7 @@
 #define OPENTHREAD_CONFIG_CSL_TIMEOUT SL_CSL_TIMEOUT
 #define SL_OPENTHREAD_CSL_TX_UNCERTAINTY 200
 
-#endif // SL_CSL_ENABLE
+#endif // SL_CSL_ENABLE || SL_CONFIG_OPENTHREAD_LIB
 
 #endif // SL_ICD_ENABLED
 

third_party/silabs/BUILD.gn

@@ -66,8 +66,6 @@ if (wifi_soc != true) {  # CCP board
   if (use_silabs_thread_lib) {
     config("libopenthread-platform_config") {
       include_dirs = [ "${openthread_root}/examples/platforms" ]
-
-      defines = [ "SL_CONFIG_OPENTHREAD_LIB=1" ]
     }
 
     copy("copy_openthread_system") {
@@ -204,6 +202,19 @@ if (wifi_soc != true) {  # CCP board
       COAP_API = ""
       if (use_thread_coap_lib) {
         COAP_API = "coap_"
+
+        sources += [
+          "${openthread_root}/examples/platforms/utils/link_metrics.cpp",
+          "${openthread_root}/examples/platforms/utils/link_metrics.h",
+          "${openthread_root}/src/core/api/link_api.cpp",
+          "${openthread_root}/src/core/mac/mac.cpp",
+          "${openthread_root}/src/core/mac/mac_frame.cpp",
+          "${openthread_root}/src/core/mac/sub_mac.cpp",
+          "${openthread_root}/src/core/thread/mle.cpp",
+          "${sl_ot_platform_abstraction}/efr32/radio.c",
+        ]
+
+        include_dirs = [ "${sl_ot_platform_abstraction}/include" ]
       }
 
       public_configs += [ "${openthread_root}:openthread_${XTD}_config" ]

third_party/silabs/efr32_sdk.gni

@@ -65,6 +65,9 @@ declare_args() {
 
   silabs_log_enabled = true
 
+  # Enable Synchronized Sleepy End Device
+  enable_synchronized_sed = false
+
   # Argument to enable IPv4 for wifi
   # aligning to match chip_inet_config_enable_ipv4 default configuration
   chip_enable_wifi_ipv4 = false
@@ -96,9 +99,6 @@ declare_args() {
   sl_ot_platform_abstraction =
       "${efr32_sdk_root}/protocol/openthread/platform-abstraction"
 
-  # Enable Synchronized Sleepy End Device
-  enable_synchronized_sed = use_silabs_thread_lib
-
   # board related pre-generated files path (default)
   sl_pre_gen_path =
       "${sdk_support_root}/matter/efr32/${silabs_family}/${silabs_board}/"
@@ -317,6 +317,7 @@ template("efr32_sdk") {
       "SL_MATTER_BLE_EXTENDED_ADV=${sl_matter_ble_extended_adv}",
       "SL_MEMORY_POOL_LIGHT=1",
       "SL_OPENTHREAD_STACK_FEATURES_CONFIG_FILE=\"sl_openthread_features_config.h\"",
+      "SL_CSL_TIMEOUT=${sl_ot_csl_timeout_sec}",
       "CIRCULAR_QUEUE_USE_LOCAL_CONFIG_HEADER=1",
       "MATTER_INTEGRATION=1",
     ]
@@ -327,18 +328,25 @@ template("efr32_sdk") {
       defines += [ "SILABS_LOG_ENABLED=0" ]
     }
 
-    # Temporary configuration to enable COAP specific configurations
-    if (use_thread_coap_lib) {
-      defines += [ "SL_USE_COAP_CONFIG=1" ]
-    }
-
     if (sl_uart_log_output) {
       defines += [
         "SILABS_LOG_OUT_UART=1",
         "SILABS_LOG_OUT_RTT=0",
       ]
     }
 
+    if (use_silabs_thread_lib) {
+      defines += [ "SL_CONFIG_OPENTHREAD_LIB=1" ]
+    } else {
+      defines += [ "SL_CONFIG_OPENTHREAD_LIB=0" ]
+    }
+
+    if (use_thread_coap_lib) {
+      defines += [ "SL_USE_COAP_CONFIG=1" ]
+    } else {
+      defines += [ "SL_USE_COAP_CONFIG=0" ]
+    }
+
     if (chip_enable_ble_rs911x) {
       defines += [
         "RSI_BLE_ENABLE=1",
@@ -462,7 +470,6 @@ template("efr32_sdk") {
           defines += [
             "CHIP_DEVICE_CONFIG_THREAD_SSED=1",
             "SL_CSL_ENABLE=1",
-            "SL_CSL_TIMEOUT=${sl_ot_csl_timeout_sec}",
           ]
         }
       }