Commit 364274b3 authored by James Smith's avatar James Smith Committed by Johan Hedberg
Browse files

modules: silabs: Link against RAIL Multiprotocol blobs when enabled 



Enables RAIL Multiprotocol support by linking against the multiprotocol
RAIL library blob when `CONFIG_SILABS_GECKO_RAIL_MULTIPROTOCOL` or
`CONFIG_SILABS_SISDK_RAIL_MULTIPROTOCOL` are enabled.

Signed-off-by: default avatarJames Smith <james@loopj.com>
parent d6c12f91

modules/hal_silabs/gecko/CMakeLists.txt

+5 −1
Original line number Diff line number Diff line
@@ -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

    if(CONFIG_SILABS_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

+11 −2
Original line number Diff line number Diff line
@@ -103,12 +103,21 @@ if(CONFIG_SOC_GECKO_HAS_RADIO) 


    if(CONFIG_SILABS_DEVICE_IS_MODULE)

      # RAIL lib and config for modules

      if(CONFIG_SILABS_SISDK_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

      if(CONFIG_SILABS_SISDK_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

      ${RADIO_DIR}/rail_lib/protocol/ble

west.yml

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ manifest: 
      groups:

        - hal

    - name: hal_silabs

      revision: 95e957408ddd967ac4b69dc32096bd3793abb76c

      revision: 295caf37909d2ff01688b1c4bd34c9b3584e8333

      path: modules/hal/silabs

      groups:

        - hal

CRA Git | Maintained and supported by SUSTech CRA and CCSE