Skip to content

Commit

Permalink
nrf_modem: add dect-phy binaries
Browse files Browse the repository at this point in the history
Add Dect NR+ PHY modem library binaries to nrfxlib.

Signed-off-by: Eivind Jølsgard <[email protected]>
  • Loading branch information
eivindj-nordic committed Apr 2, 2024
1 parent 13cd978 commit 4cca82c
Show file tree
Hide file tree
Showing 16 changed files with 1,212 additions and 7 deletions.
10 changes: 8 additions & 2 deletions nrf_modem/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

if(CONFIG_NRF_MODEM_LINK_BINARY)
if(CONFIG_NRF_MODEM_LINK_BINARY_LTE OR CONFIG_NRF_MODEM_LINK_BINARY_DECT_PHY)

string(REGEX REPLACE "_[a-zA-Z][a-zA-Z][a-zA-Z][a-zA-Z]$" "" arch_soc_dir ${CONFIG_SOC})

Expand All @@ -24,10 +24,16 @@ if(CONFIG_NRF_MODEM_LINK_BINARY)
set(float_dir soft-float)
endif()

set(NRF_MODEM_LIB_DIR "lib/${arch_soc_dir}/${float_dir}")
if(CONFIG_NRF_MODEM_LINK_BINARY_LTE)
set(NRF_MODEM_LIB_DIR "lib/lte/${arch_soc_dir}/${float_dir}")
elseif(CONFIG_NRF_MODEM_LINK_BINARY_DECT_PHY)
set(NRF_MODEM_LIB_DIR "lib/dect_phy/${arch_soc_dir}/${float_dir}")
endif()

if(CONFIG_NRF_MODEM_LOG)
zephyr_library_import(modem ${CMAKE_CURRENT_SOURCE_DIR}/${NRF_MODEM_LIB_DIR}/libmodem_log.a)
elseif(CONFIG_NRF_MODEM_TRACE)
zephyr_library_import(modem ${CMAKE_CURRENT_SOURCE_DIR}/${NRF_MODEM_LIB_DIR}/libmodem_tracing.a)
else()
zephyr_library_import(modem ${CMAKE_CURRENT_SOURCE_DIR}/${NRF_MODEM_LIB_DIR}/libmodem.a)
endif()
Expand Down
17 changes: 13 additions & 4 deletions nrf_modem/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,30 @@ choice NRF_MODEM_BUILD_STRATEGY
depends on NRF_MODEM
prompt "Build strategy"

config NRF_MODEM_LINK_BINARY
bool "Link binary"
config NRF_MODEM_LINK_BINARY_LTE
bool "Link LTE binary"

config NRF_MODEM_LINK_BINARY_DECT_PHY
bool "Link DECT binary"
endchoice

config NRF_MODEM_LOG
depends on NRF_MODEM_LINK_BINARY
depends on NRF_MODEM_LINK_BINARY_LTE || NRF_MODEM_LINK_BINARY_DECT_PHY
bool "Link binary with logs"
help
Links the application with the library version capable of emitting logs.
This increases the final size of the application.

config NRF_MODEM_TRACE
bool "Link with binary with FIDO traces"
depends on !NRF_MODEM_LOG && NRF_MODEM_LINK_BINARY_DECT_PHY
help
Link with the binary that supports FIDO tracing.
endmenu

# This configuration is auto-generated.
# Do not edit.
config NRF_MODEM_SHMEM_CTRL_SIZE
hex
default 0x4e8 # import
default 0x728 if NRF_MODEM_LINK_BINARY_DECT_PHY # import DECT_PHY
default 0x4e8 # import LTE
2 changes: 1 addition & 1 deletion nrf_modem/include/nrf_modem.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ extern "C" {
*
* @note: The size of this area is build constant.
*/
#define NRF_MODEM_SHMEM_CTRL_SIZE 0x4e8
#define NRF_MODEM_SHMEM_CTRL_SIZE 0x728

/** @brief Shared memory configuration in normal operation mode. */
struct nrf_modem_shmem_cfg {
Expand Down
Loading

0 comments on commit 4cca82c

Please sign in to comment.