STM32WB15xC MCU support

Author: jeromecoutant

connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/HCIDriver.cpp

@@ -84,7 +84,9 @@ static bool get_bd_address(uint8_t *bd_addr);
 static bool sysevt_wait(void);
 static bool sysevt_check(void);
 
+#if DEVICE_FLASH
 extern int BLE_inited;
+#endif
 
 namespace ble {
 namespace vendor {
@@ -490,6 +492,20 @@ class TransportDriver : public CordioHCITransportDriver {
                 tr_info("WIRELESS COPROCESSOR FW VERSION ID = %d.%d.%d", p_wireless_info->VersionMajor, p_wireless_info->VersionMinor, p_wireless_info->VersionSub);
                 tr_info("WIRELESS COPROCESSOR FW STACK TYPE = %d (ROM size 0x%x)", p_wireless_info->StackType, MBED_ROM_SIZE);
 
+#if STM32WB15xx
+                switch (p_wireless_info->StackType) {
+                    case INFO_STACK_TYPE_BLE_FULL:
+                        error("Wrong BLE FW\n");
+                        break;
+                    case INFO_STACK_TYPE_BLE_HCI:
+                        if (MBED_ROM_SIZE > 0x32800)  {
+                            error("Wrong MBED_ROM_SIZE with HCI FW\n");
+                        }
+                        break;
+                    default:
+                        tr_error("StackType %u not expected\n", p_wireless_info->StackType);
+                }
+#endif
 #if STM32WB55xx
                 switch (p_wireless_info->StackType) {
                     case INFO_STACK_TYPE_BLE_FULL:
@@ -681,8 +697,10 @@ class TransportDriver : public CordioHCITransportDriver {
          */
         SHCI_C2_BLE_Init(&ble_init_cmd_packet);
 
+#if DEVICE_FLASH
         /* Used in flash_api.c */
         BLE_inited = 1;
+#endif
     }
 
     TL_CmdPacket_t *bleCmdBuf;

targets/TARGET_STM/TARGET_STM32WB/PeripheralNames.h

@@ -35,28 +35,42 @@ typedef enum {
 #define DEVICE_SPI_COUNT 2
 typedef enum {
     SPI_1 = (int)SPI1_BASE,
-    SPI_2 = (int)SPI2_BASE
+#if defined SPI2_BASE
+    SPI_2 = (int)SPI2_BASE,
+#endif
 } SPIName;
 
 typedef enum {
     I2C_1 = (int)I2C1_BASE,
+#if defined I2C3_BASE
     I2C_3 = (int)I2C3_BASE
+#endif
 } I2CName;
 
 typedef enum {
     PWM_1  = (int)TIM1_BASE,
+#if defined TIM2_BASE
     PWM_2  = (int)TIM2_BASE,
+#endif
+#if defined TIM16_BASE
     PWM_16 = (int)TIM16_BASE,
+#endif
+#if defined TIM17_BASE
     PWM_17 = (int)TIM17_BASE
+#endif
 } PWMName;
 
+#if defined QUADSPI_R_BASE
 typedef enum {
     QSPI_1 = (int)QUADSPI_R_BASE
 } QSPIName;
+#endif
 
+#if defined USB_BASE
 typedef enum {
     USB_FS = (int)USB_BASE,
 } USBName;
+#endif
 
 #ifdef __cplusplus
 }

targets/TARGET_STM/TARGET_STM32WB/STM32Cube_FW/app_conf.h

@@ -148,7 +148,11 @@
  * Maximum number of simultaneous connections that the device will support.
  * Valid values are from 1 to 8
  */
+#ifdef TARGET_MCU_STM32WB15xC
+#define CFG_BLE_NUM_LINK            4
+#else
 #define CFG_BLE_NUM_LINK            8
+#endif
 
 /**
  * Maximum number of Services that can be stored in the GATT database.

targets/TARGET_STM/TARGET_STM32WB/STM32Cube_FW/stm32_lpm_if.c

@@ -122,7 +122,11 @@ void PWR_EnterStopMode( void )
   /************************************************************************************
    * ENTER STOP MODE
    ***********************************************************************************/
+#if defined(PWR_SUPPORT_STOP2)
   LL_PWR_SetPowerMode( LL_PWR_MODE_STOP2 );
+#else
+  LL_PWR_SetPowerMode( LL_PWR_MODE_STOP1 );
+#endif
 
   LL_LPM_EnableDeepSleep( ); /**< Set SLEEPDEEP bit of Cortex System Control Register */
 

targets/TARGET_STM/TARGET_STM32WB/TARGET_STM32WB15xC/CMakeLists.txt

@@ -19,6 +19,7 @@ target_include_directories(mbed-stm32wb15xc
 target_sources(mbed-stm32wb15xc
     INTERFACE
         ${STARTUP_FILE}
+        system_clock.c
 )
 
 mbed_set_linker_script(mbed-stm32wb15xc ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})

targets/TARGET_STM/TARGET_STM32WB/TARGET_STM32WB15xC/TOOLCHAIN_ARM/stm32wb15xc.sct

@@ -22,7 +22,9 @@
 #endif
 
 #if !defined(MBED_APP_SIZE)
-  #define MBED_APP_SIZE  MBED_ROM_SIZE
+// MBED_APP_SIZE cannot be full ROM size as core M0 FW is using the end of FLASH
+// Size is defined in json with "mbed_rom_size"
+#define MBED_APP_SIZE MBED_ROM_SIZE
 #endif
 
 #if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE)
@@ -37,6 +39,7 @@
 /* Round up VECTORS_SIZE to 8 bytes */
 #define VECTORS_SIZE  (((NVIC_NUM_VECTORS * 4) + 7) AND ~7)
 
+; RAM_SIZE = 12KB SRAM (0x3000) + Shared mem (part of SRAM2)
 LR_IROM1  MBED_APP_START  MBED_APP_SIZE  {
 
   ER_IROM1  MBED_APP_START  MBED_APP_SIZE  {
@@ -49,9 +52,17 @@ LR_IROM1  MBED_APP_START  MBED_APP_SIZE  {
     .ANY (+RW +ZI)
   }
 
-  ARM_LIB_HEAP  AlignExpr(+0, 16)  EMPTY  (MBED_RAM_START + MBED_RAM_SIZE - MBED_CONF_TARGET_BOOT_STACK_SIZE - AlignExpr(ImageLimit(RW_IRAM1), 16))  { ; Heap growing up
+  ARM_LIB_HEAP  AlignExpr(+0, 16)  EMPTY  (MBED_RAM_START + 0x3000 - MBED_CONF_TARGET_BOOT_STACK_SIZE - AlignExpr(ImageLimit(RW_IRAM1), 16))  { ; Heap growing up
   }
 
-  ARM_LIB_STACK  (MBED_RAM_START + MBED_RAM_SIZE)  EMPTY  -MBED_CONF_TARGET_BOOT_STACK_SIZE  { ; Stack region growing down
+  ARM_LIB_STACK  (MBED_RAM_START + 0x3000)  EMPTY  -MBED_CONF_TARGET_BOOT_STACK_SIZE  { ; Stack region growing down
   }
+
+  ; SRAM2 - Shared memory
+  RW_IRAM2 0x20030000 0x2800  {  ; RW data
+    *(MAPPING_TABLE)
+    *(MB_MEM1)
+    *(MB_MEM2)
+  }
+
 }

targets/TARGET_STM/TARGET_STM32WB/TARGET_STM32WB15xC/TOOLCHAIN_GCC_ARM/stm32wb15xc.ld

@@ -23,7 +23,9 @@
 #endif
 
 #if !defined(MBED_APP_SIZE)
-  #define MBED_APP_SIZE  MBED_ROM_SIZE
+/* MBED_APP_SIZE cannot be full ROM size as core M0 FW is using the end of FLASH */
+/* Size is defined in json with "mbed_rom_size" */
+#define MBED_APP_SIZE MBED_ROM_SIZE
 #endif
 
 #if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE)
@@ -35,10 +37,12 @@
 /* Round up VECTORS_SIZE to 8 bytes */
 #define VECTORS_SIZE  (((NVIC_NUM_VECTORS * 4) + 7) & 0xFFFFFFF8)
 
+/* RAM_SIZE = 12KB SRAM (0x3000) + Shared mem (part of SRAM2) */
 MEMORY
-{
-    FLASH (rx)   : ORIGIN = MBED_APP_START, LENGTH = MBED_APP_SIZE
-    RAM (rwx)    : ORIGIN = MBED_RAM_START + VECTORS_SIZE, LENGTH = MBED_RAM_SIZE - VECTORS_SIZE
+{ 
+  FLASH (rx) : ORIGIN = MBED_APP_START, LENGTH = MBED_APP_SIZE
+  RAM (rwx)   : ORIGIN = MBED_RAM_START + VECTORS_SIZE, LENGTH = 0x3000 - VECTORS_SIZE
+  RAM2 (rw)  : ORIGIN = 0x20030000, LENGTH = 10K
 }
 
 /* Linker script to place sections and symbol values. Should be used together
@@ -191,6 +195,19 @@ SECTIONS
         *(.stack*)
     } > RAM
 
+    .ble_stby_mem (NOLOAD) :
+    {
+      *(MAPPING_TABLE);
+      *(MB_MEM1);
+    } >RAM2
+
+    .ble_shared_no_ret (NOLOAD) :
+    {
+      _sMB_MEM2 = . ;
+      *(MB_MEM2);
+      _eMB_MEM2 = . ;
+    } >RAM2
+
     /* Set stack top to end of RAM, and stack limit move down by
      * size of stack_dummy section */
     __StackTop = ORIGIN(RAM) + LENGTH(RAM);