lib: stm32wba: Update ble folder architecture on STM32WBA

rename ble folder and add/change CMakeList

Signed-off-by: Vincent Tardy <[email protected]>

Author: vtardy-st

lib/stm32wba/CMakeLists.txt

@@ -2,40 +2,22 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-zephyr_compile_definitions( -DBLE )
-
-zephyr_include_directories(BLE_TransparentMode/Core/Inc)
-zephyr_include_directories(BLE_TransparentMode/STM32_WPAN/Target)
-zephyr_include_directories(BLE_TransparentMode/System/Config/Debug_GPIO)
-zephyr_include_directories(BLE_TransparentMode/System/Config/Log)
 zephyr_include_directories(Common/WPAN/Interfaces)
 zephyr_include_directories(Common/WPAN/Modules)
 zephyr_include_directories(Common/WPAN/Modules/Flash)
 zephyr_include_directories(Common/WPAN/Modules/RTDebug)
 zephyr_include_directories(Common/WPAN/Modules/Log)
-zephyr_include_directories(STM32_WPAN)
-zephyr_include_directories(STM32_WPAN/ble/stack/include)
-zephyr_include_directories(STM32_WPAN/ble/stack/include/auto)
-zephyr_include_directories(STM32_WPAN/link_layer/ll_cmd_lib/config/ble_full)
-zephyr_include_directories(STM32_WPAN/link_layer/ll_cmd_lib/inc)
-zephyr_include_directories(STM32_WPAN/link_layer/ll_cmd_lib/inc/_40nm_reg_files)
-zephyr_include_directories(STM32_WPAN/link_layer/ll_sys/inc)
 zephyr_include_directories(Utilities/misc)
 zephyr_include_directories(Utilities/tim_serv)
 zephyr_include_directories(Utilities/trace/adv_trace)
+zephyr_include_directories(STM32_WPAN)
+
 
-zephyr_sources(BLE_TransparentMode/STM32_WPAN/Target/bpka.c)
-zephyr_sources(BLE_TransparentMode/STM32_WPAN/Target/linklayer_plat.c)
-zephyr_sources(BLE_TransparentMode/STM32_WPAN/Target/ll_sys_if.c)
-zephyr_sources(BLE_TransparentMode/STM32_WPAN/Target/power_table.c)
 zephyr_sources(Common/WPAN/Modules/Log/log_module.c)
 zephyr_sources(Common/WPAN/Interfaces/hw_pka.c)
 zephyr_sources(Common/WPAN/Interfaces/hw_pka_p256.c)
 zephyr_sources(Common/WPAN/Modules/RTDebug/RTDebug.c)
-zephyr_sources(STM32_WPAN/link_layer/ll_sys/src/ll_sys_cs.c)
-zephyr_sources(STM32_WPAN/link_layer/ll_sys/src/ll_sys_dp_slp.c)
-zephyr_sources(STM32_WPAN/link_layer/ll_sys/src/ll_sys_intf.c)
-zephyr_sources(STM32_WPAN/link_layer/ll_sys/src/ll_sys_startup.c)
+
 
 if(CONFIG_FLASH)
   zephyr_sources(Common/WPAN/Modules/Flash/flash_manager.c)
@@ -44,6 +26,9 @@ if(CONFIG_FLASH)
   zephyr_sources(Common/WPAN/Modules/Flash/rf_timing_synchro.c)
 endif()
 
+set(STM32WBA_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../zephyr/blobs/stm32wba/lib)
+
+# select the type of BLE library
 if (CONFIG_BT_EXT_ADV
     OR (CONFIG_BT_PER_ADV OR CONFIG_BT_PER_ADV_SYNC)
     OR CONFIG_BT_SCA_UPDATE
@@ -63,25 +48,21 @@ else()
   set(BLE_LIB_TYPE "BLE_LIB_BASIC")
 endif()
 
-	
-set(STM32WBA_BLE_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../zephyr/blobs/stm32wba/lib)
 set(STM32WBA_BLE_LIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/STM32_WPAN/ble/stack)
-set(STM32WBA_LL_LIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/STM32_WPAN/link_layer/ll_cmd_lib)
 
 add_library(stm32wba_ble_lib STATIC IMPORTED GLOBAL)
-add_library(stm32wba_ll_lib STATIC IMPORTED GLOBAL)
 
 add_dependencies(
   stm32wba_ble_lib
   stm32wba_ll_lib
 )
 if (BLE_LIB_TYPE STREQUAL "BLE_LIB_BASIC")
   set_target_properties(
-    stm32wba_ble_lib PROPERTIES IMPORTED_LOCATION ${STM32WBA_BLE_LIB_DIR}/stm32wba_ble_stack_llobasic.a
+    stm32wba_ble_lib PROPERTIES IMPORTED_LOCATION ${STM32WBA_LIB_DIR}/stm32wba_ble_stack_llobasic.a
   )
 elseif (BLE_LIB_TYPE STREQUAL "BLE_LIB_FULL")
   set_target_properties(
-    stm32wba_ble_lib PROPERTIES IMPORTED_LOCATION ${STM32WBA_BLE_LIB_DIR}/stm32wba_ble_stack_llo.a
+    stm32wba_ble_lib PROPERTIES IMPORTED_LOCATION ${STM32WBA_LIB_DIR}/stm32wba_ble_stack_llo.a
   )
 endif()
 
@@ -90,9 +71,13 @@ if(NOT CONFIG_BT_STM32WBA_USE_TEMP_BASED_CALIB)
   zephyr_compile_definitions( -DUSE_TEMPERATURE_BASED_RADIO_CALIBRATION=0 )
 endif()
 
-# Selecting the proper version of link layer lib according the soc
-# Checking all the soc variants and not simply relying on board name 
+# Using the selected version of ble lib
+set_target_properties(stm32wba_ble_lib PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${STM32WBA_BLE_LIB_INCLUDE_DIR})
 
+target_link_libraries(app PUBLIC stm32wba_ble_lib)
+
+# Selecting the proper version of link layer lib
+# Checking all the soc variants and not simply relying on board name 
 if(CONFIG_SOC_STM32WBA65XX)
   message(STATUS "STM32WBA6 link layer lib selected")
   if (BLE_LIB_TYPE STREQUAL "BLE_LIB_BASIC")
@@ -111,10 +96,12 @@ if(CONFIG_SOC_STM32WBA55XX OR SOC_STM32WBA52XX)
   endif()
 endif()
 
-# Using the selected version of link layer lib
-set_target_properties(stm32wba_ll_lib PROPERTIES IMPORTED_LOCATION ${STM32WBA_BLE_LIB_DIR}/${LL_LIB})
-set_target_properties(stm32wba_ble_lib PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${STM32WBA_BLE_LIB_INCLUDE_DIR})
+add_library(stm32wba_ll_lib STATIC IMPORTED GLOBAL)
+set(STM32WBA_LL_LIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/STM32_WPAN/link_layer/ll_cmd_lib)
+set_target_properties(stm32wba_ll_lib PROPERTIES IMPORTED_LOCATION ${STM32WBA_LIB_DIR}/${LL_LIB})
 set_target_properties(stm32wba_ll_lib PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${STM32WBA_LL_LIB_INCLUDE_DIR})
-
-target_link_libraries(app PUBLIC stm32wba_ble_lib)
 target_link_libraries(app PUBLIC stm32wba_ll_lib)
+
+add_subdirectory(STM32_WPAN)
+
+add_subdirectory_ifdef(CONFIG_BT_STM32WBA ble)

lib/stm32wba/README.rst

@@ -22,7 +22,7 @@ Description:
       Middlewares/ST/STM32_WPAN/ble/stack/include/ble_std.h
       Middlewares/ST/STM32_WPAN/ble/stack/include/bleplat.h
       Middlewares/ST/STM32_WPAN/ble/stack/include/blestack.h
-      Middlewares/ST/STM32_WPAN/link_layer/ll_cmd_lib/inc/_40nm_reg_files/DWC_ble154combo.h
+      Middlewares/ST/STM32_WPAN/link_layer/ll_cmd_lib/_40nm_reg_files/_40nm_reg_files/DWC_ble154combo.h
       Middlewares/ST/STM32_WPAN/link_layer/ll_cmd_lib/inc/bsp.h
       Middlewares/ST/STM32_WPAN/link_layer/ll_cmd_lib/inc/common_types.h
       Middlewares/ST/STM32_WPAN/link_layer/ll_cmd_lib/inc/event_manager.h
@@ -71,7 +71,7 @@ Description:
       Projects/Common/WPAN/Modules/Log/log_module.c
       Projects/Common/WPAN/Modules/Log/log_module.h
       Projects/NUCLEO-WBA65RI/Applications/BLE/BLE_TransparentMode/System/Config/Debug_GPIO/app_debug.h
-      Projects/NUCLEO-WBA65RI/Applications/BLE/BLE_TransparentMode/System/Config/Debug_GPIO/debug_config.h
+      Projects/NUCLEO-WBA65RI/Applications/BLE/BLE_TransparentMode/System/Config/Log/log_module_conf.h
       Projects/NUCLEO-WBA65RI/Applications/BLE/BLE_TransparentMode/STM32_WPAN/Target/power_table.c
       Projects/NUCLEO-WBA65RI/Applications/BLE/BLE_TransparentMode/STM32_WPAN/Target/bpka.c
       Projects/NUCLEO-WBA65RI/Applications/BLE/BLE_TransparentMode/STM32_WPAN/Target/bpka.h

lib/stm32wba/STM32_WPAN/CMakeLists.txt

@@ -0,0 +1,21 @@
+# Copyright (c) 2025 STMicroelectronics
+#
+# SPDX-License-Identifier: Apache-2.0
+if (CONFIG_BT_STM32WBA)
+zephyr_compile_definitions( -DBLE )
+endif()
+
+if (CONFIG_BT_STM32WBA)
+zephyr_include_directories(ble/stack/include)
+zephyr_include_directories(ble/stack/include/auto)
+zephyr_include_directories(link_layer/ll_cmd_lib/config/ble_full)
+endif()
+zephyr_include_directories(inc)
+zephyr_include_directories(link_layer/ll_cmd_lib/inc)
+zephyr_include_directories(link_layer/ll_cmd_lib/inc/_40nm_reg_files)
+zephyr_include_directories(link_layer/ll_sys/inc)
+
+zephyr_sources(link_layer/ll_sys/src/ll_sys_cs.c)
+zephyr_sources(link_layer/ll_sys/src/ll_sys_dp_slp.c)
+zephyr_sources(link_layer/ll_sys/src/ll_sys_intf.c)
+zephyr_sources(link_layer/ll_sys/src/ll_sys_startup.c)

lib/stm32wba/ble/CMakeLists.txt

@@ -0,0 +1,11 @@
+# Copyright (c) 2025 STMicroelectronics
+#
+# SPDX-License-Identifier: Apache-2.0
+zephyr_include_directories(Core/Inc)
+zephyr_include_directories(STM32_WPAN/Target)
+zephyr_include_directories(System/Config/Debug_GPIO)
+zephyr_include_directories(System/Config/Log)
+zephyr_sources(STM32_WPAN/Target/bpka.c)
+zephyr_sources(STM32_WPAN/Target/linklayer_plat.c)
+zephyr_sources(STM32_WPAN/Target/ll_sys_if.c)
+zephyr_sources(STM32_WPAN/Target/power_table.c)