system(WBA): update STM32WBAxx system

fpistm · fpistm · commit 71a554bf4801 · 2024-02-15T15:22:18.000+01:00
Remove duplicate clock definition.
Allow VECT_TAB_OFFSET redefinition.

Signed-off-by: Frederic Pillon &lt;frederic.pillon@st.com&gt;
diff --git a/system/STM32WBAxx/system_stm32wbaxx.c b/system/STM32WBAxx/system_stm32wbaxx.c
@@ -96,37 +96,32 @@
 /** @addtogroup STM32WBAxx_System_Private_Defines
   * @{
   */
-#if !defined (HSE_VALUE)
-#define HSE_VALUE     (32000000U) /*!< Value of the External oscillator in Hz */
-#endif /* HSE_VALUE */
-
-#if !defined (HSI_VALUE)
-#define HSI_VALUE     (16000000U) /*!< Value of the Internal oscillator in Hz*/
-#endif /* HSI_VALUE */
 
 /* Note: Following vector table addresses must be defined in line with linker
          configuration. */
 /*!< Uncomment the following line if you need to relocate the vector table
      anywhere in Flash or Sram, else the vector table is kept at the automatic
      remap of boot address selected */
-/* #define USER_VECT_TAB_ADDRESS */
+/* #define VECT_TAB_BASE_ADDRESS 0x08000000 */
 
-#if defined(USER_VECT_TAB_ADDRESS)
 /*!< Uncomment the following line if you need to relocate your vector Table
      in Sram else user remap will be done in Flash. */
 /* #define VECT_TAB_SRAM */
+
+#ifndef VECT_TAB_OFFSET
+#define VECT_TAB_OFFSET         0x00000000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x200. */
+#endif
+
+#ifndef VECT_TAB_BASE_ADDRESS
 #if defined(VECT_TAB_SRAM)
 #define VECT_TAB_BASE_ADDRESS   SRAM1_BASE      /*!< Vector Table base address field.
                                                      This value must be a multiple of 0x200. */
-#define VECT_TAB_OFFSET         0x00000000U     /*!< Vector Table base offset field.
-                                                     This value must be a multiple of 0x200. */
 #else
 #define VECT_TAB_BASE_ADDRESS   FLASH_BASE      /*!< Vector Table base address field.
                                                      This value must be a multiple of 0x200. */
-#define VECT_TAB_OFFSET         0x00000000U     /*!< Vector Table base offset field.
-                                                     This value must be a multiple of 0x200. */
 #endif /* VECT_TAB_SRAM */
-#endif /* USER_VECT_TAB_ADDRESS */
+#endif /* VECT_TAB_BASE_ADDRESS */
 
 /******************************************************************************/
 
@@ -193,9 +188,7 @@ void SystemInit(void)
 #endif
 
   /* Configure the Vector Table location -------------------------------------*/
-#if defined(USER_VECT_TAB_ADDRESS)
   SCB->VTOR = VECT_TAB_BASE_ADDRESS | VECT_TAB_OFFSET; /* Vector Table Relocation */
-#endif /* USER_VECT_TAB_ADDRESS */
 
 #if defined(STM32WBAXX_SI_CUT1_0)
   /* Work-around for ADC peripheral issue possibly impacting system
