nrf_modem: prepare to add dect-phy binaries

Prepare to add Dect NR+ PHY modem library binaries to nrfxlib. Signed-off-by: Eivind Jølsgard <[email protected]>
lemrey · Apr 16, 2024 · d3770f6 · d3770f6
1 parent 13cd978
commit d3770f6
Show file tree

Hide file tree

Showing 21 changed files with 16 additions and 8 deletions.
diff --git a/nrf_modem/CMakeLists.txt b/nrf_modem/CMakeLists.txt
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-if(CONFIG_NRF_MODEM_LINK_BINARY)
+if(CONFIG_NRF_MODEM_LINK_BINARY_CELLULAR 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})
 
@@ -24,14 +24,18 @@ 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_CELLULAR)
+    zephyr_include_directories(cellular/include)
+    set(NRF_MODEM_LIB_DIR "cellular/lib/${arch_soc_dir}/${float_dir}")
+  elseif(CONFIG_NRF_MODEM_LINK_BINARY_DECT_PHY)
+    zephyr_include_directories(dect_phy/include)
+    set(NRF_MODEM_LIB_DIR "dect_phy/lib/${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)
   else()
     zephyr_library_import(modem ${CMAKE_CURRENT_SOURCE_DIR}/${NRF_MODEM_LIB_DIR}/libmodem.a)
   endif()
 
-  zephyr_include_directories(include)
-
 endif()
diff --git a/nrf_modem/Kconfig b/nrf_modem/Kconfig
@@ -15,12 +15,15 @@ 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_CELLULAR
+	bool "Link cellular binary"
+
+config NRF_MODEM_LINK_BINARY_DECT_PHY
+	bool "Link DECT PHY binary"
 endchoice
 
 config NRF_MODEM_LOG
-	depends on NRF_MODEM_LINK_BINARY
+	depends on NRF_MODEM_LINK_BINARY_CELLULAR || NRF_MODEM_LINK_BINARY_DECT_PHY
 	bool "Link binary with logs"
 	help
 	  Links the application with the library version capable of emitting logs.
@@ -32,4 +35,5 @@ endmenu
 # 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 CELLULAR
diff --git a/nrf_modem/include/nrf_errno.h → nrf_modem/cellular/include/nrf_errno.h b/nrf_modem/include/nrf_errno.h → nrf_modem/cellular/include/nrf_errno.h
diff --git a/nrf_modem/include/nrf_gai_errors.h → nrf_modem/cellular/include/nrf_gai_errors.h b/nrf_modem/include/nrf_gai_errors.h → nrf_modem/cellular/include/nrf_gai_errors.h
diff --git a/nrf_modem/include/nrf_modem.h → nrf_modem/cellular/include/nrf_modem.h b/nrf_modem/include/nrf_modem.h → nrf_modem/cellular/include/nrf_modem.h
diff --git a/nrf_modem/include/nrf_modem_at.h → nrf_modem/cellular/include/nrf_modem_at.h b/nrf_modem/include/nrf_modem_at.h → nrf_modem/cellular/include/nrf_modem_at.h
diff --git a/nrf_modem/include/nrf_modem_bootloader.h → ...m/cellular/include/nrf_modem_bootloader.h b/nrf_modem/include/nrf_modem_bootloader.h → ...m/cellular/include/nrf_modem_bootloader.h
diff --git a/nrf_modem/include/nrf_modem_delta_dfu.h → ...em/cellular/include/nrf_modem_delta_dfu.h b/nrf_modem/include/nrf_modem_delta_dfu.h → ...em/cellular/include/nrf_modem_delta_dfu.h
diff --git a/nrf_modem/include/nrf_modem_gnss.h → nrf_modem/cellular/include/nrf_modem_gnss.h b/nrf_modem/include/nrf_modem_gnss.h → nrf_modem/cellular/include/nrf_modem_gnss.h
diff --git a/nrf_modem/include/nrf_modem_os.h → nrf_modem/cellular/include/nrf_modem_os.h b/nrf_modem/include/nrf_modem_os.h → nrf_modem/cellular/include/nrf_modem_os.h
diff --git a/nrf_modem/include/nrf_modem_softsim.h → ...odem/cellular/include/nrf_modem_softsim.h b/nrf_modem/include/nrf_modem_softsim.h → ...odem/cellular/include/nrf_modem_softsim.h
diff --git a/nrf_modem/include/nrf_modem_trace.h → nrf_modem/cellular/include/nrf_modem_trace.h b/nrf_modem/include/nrf_modem_trace.h → nrf_modem/cellular/include/nrf_modem_trace.h
diff --git a/nrf_modem/include/nrf_socket.h → nrf_modem/cellular/include/nrf_socket.h b/nrf_modem/include/nrf_socket.h → nrf_modem/cellular/include/nrf_socket.h
diff --git a/nrf_modem/lib/nRF9120/hard-float/libmodem.a → ...ellular/lib/nRF9120/hard-float/libmodem.a b/nrf_modem/lib/nRF9120/hard-float/libmodem.a → ...ellular/lib/nRF9120/hard-float/libmodem.a
diff --git a/...dem/lib/nRF9120/hard-float/libmodem_log.a → ...lar/lib/nRF9120/hard-float/libmodem_log.a b/...dem/lib/nRF9120/hard-float/libmodem_log.a → ...lar/lib/nRF9120/hard-float/libmodem_log.a
diff --git a/nrf_modem/lib/nRF9120/soft-float/libmodem.a → ...ellular/lib/nRF9120/soft-float/libmodem.a b/nrf_modem/lib/nRF9120/soft-float/libmodem.a → ...ellular/lib/nRF9120/soft-float/libmodem.a
diff --git a/...dem/lib/nRF9120/soft-float/libmodem_log.a → ...lar/lib/nRF9120/soft-float/libmodem_log.a b/...dem/lib/nRF9120/soft-float/libmodem_log.a → ...lar/lib/nRF9120/soft-float/libmodem_log.a
diff --git a/nrf_modem/lib/nRF9160/hard-float/libmodem.a → ...ellular/lib/nRF9160/hard-float/libmodem.a b/nrf_modem/lib/nRF9160/hard-float/libmodem.a → ...ellular/lib/nRF9160/hard-float/libmodem.a
diff --git a/...dem/lib/nRF9160/hard-float/libmodem_log.a → ...lar/lib/nRF9160/hard-float/libmodem_log.a b/...dem/lib/nRF9160/hard-float/libmodem_log.a → ...lar/lib/nRF9160/hard-float/libmodem_log.a
diff --git a/nrf_modem/lib/nRF9160/soft-float/libmodem.a → ...ellular/lib/nRF9160/soft-float/libmodem.a b/nrf_modem/lib/nRF9160/soft-float/libmodem.a → ...ellular/lib/nRF9160/soft-float/libmodem.a
diff --git a/...dem/lib/nRF9160/soft-float/libmodem_log.a → ...lar/lib/nRF9160/soft-float/libmodem_log.a b/...dem/lib/nRF9160/soft-float/libmodem_log.a → ...lar/lib/nRF9160/soft-float/libmodem_log.a