modules: silabs: Link against RAIL Multiprotocol blobs when enabled

Enables RAIL Multiprotocol support by linking against the multiprotocol version of the RAIL blob when `CONFIG_SOC_GECKO_RAIL_MULTIPROTOCOL` is enabled.

Signed-off-by: James Smith <[email protected]>

Author: loopj

modules/hal_silabs/gecko/CMakeLists.txt

@@ -49,7 +49,11 @@ if(${CONFIG_SOC_GECKO_HAS_RADIO})
     zephyr_library_sources(${RADIO_DIR}/rail_lib/plugin/pa-conversions/pa_curves_efr32.c)
 
     # prebuilt libs
-    add_prebuilt_library(librail platform/radio/rail_lib/autogen/librail_release/librail_efr32xg${GECKO_SERIES_NUMBER}_gcc_release.a)
+    if(CONFIG_SOC_GECKO_RAIL_MULTIPROTOCOL)
+      add_prebuilt_library(librail platform/radio/rail_lib/autogen/librail_release/librail_multiprotocol_efr32xg${GECKO_SERIES_NUMBER}_gcc_release.a)
+    else()
+      add_prebuilt_library(librail platform/radio/rail_lib/autogen/librail_release/librail_efr32xg${GECKO_SERIES_NUMBER}_gcc_release.a)
+    endif()
 
     if(CONFIG_SOC_GECKO_CUSTOM_RADIO_PHY)
       zephyr_include_directories(

modules/hal_silabs/simplicity_sdk/CMakeLists.txt

@@ -103,11 +103,20 @@ if(CONFIG_SOC_GECKO_HAS_RADIO)
 
     if(CONFIG_SILABS_DEVICE_IS_MODULE)
       # RAIL lib and config for modules
-      add_prebuilt_library(librail platform/radio/rail_lib/autogen/librail_release/librail_module_efr32xg${SILABS_DEVICE_FAMILY_NUMBER}_gcc_release.a)
+      if(CONFIG_SOC_GECKO_RAIL_MULTIPROTOCOL)
+        add_prebuilt_library(librail platform/radio/rail_lib/autogen/librail_release/librail_multiprotocol_module_efr32xg${SILABS_DEVICE_FAMILY_NUMBER}_gcc_release.a)
+      else()
+        add_prebuilt_library(librail platform/radio/rail_lib/autogen/librail_release/librail_module_efr32xg${SILABS_DEVICE_FAMILY_NUMBER}_gcc_release.a)
+      endif()
+
       add_prebuilt_library(librail_config platform/radio/rail_lib/autogen/librail_release/librail_config_${CONFIG_SOC}_gcc.a)
     else()
       # generic RAIL lib for SoCs
-      add_prebuilt_library(librail platform/radio/rail_lib/autogen/librail_release/librail_efr32xg${SILABS_DEVICE_FAMILY_NUMBER}_gcc_release.a)
+      if(CONFIG_SOC_GECKO_RAIL_MULTIPROTOCOL)
+        add_prebuilt_library(librail platform/radio/rail_lib/autogen/librail_release/librail_multiprotocol_efr32xg${SILABS_DEVICE_FAMILY_NUMBER}_gcc_release.a)
+      else()
+        add_prebuilt_library(librail platform/radio/rail_lib/autogen/librail_release/librail_efr32xg${SILABS_DEVICE_FAMILY_NUMBER}_gcc_release.a)
+      endif()
     endif()
 
     zephyr_include_directories_ifdef(CONFIG_SOC_GECKO_CUSTOM_RADIO_PHY

west.yml

@@ -235,7 +235,7 @@ manifest:
       groups:
         - hal
     - name: hal_silabs
-      revision: 190a144a16bed9a938a94543ed5bbc70c0552e0f
+      revision: pull/126/head
       path: modules/hal/silabs
       groups:
         - hal