Skip to content

Commit 37b893a

Browse files
committed
system(wl3): update STM32WL3x system
Remove duplicate clock definition. Allow VECT_TAB_OFFSET redefinition. Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 462f22a commit 37b893a

File tree

1 file changed

+9
-22
lines changed

1 file changed

+9
-22
lines changed

system/STM32WL3x/system_stm32wl3x.c

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -74,38 +74,29 @@
7474
/** @addtogroup STM32WL3x_System_Private_Defines
7575
* @{
7676
*/
77-
#if !defined (HSE_VALUE)
78-
#define HSE_VALUE (48000000U) /*!< Value of the External oscillator in Hz */
79-
#endif /* HSE_VALUE */
80-
81-
#if !defined (HSI_VALUE)
82-
#define HSI_VALUE (64000000U) /*!< Value of the Internal oscillator in Hz*/
83-
#endif /* HSI_VALUE */
8477

8578
/* Note: Following vector table addresses must be defined in line with linker
8679
configuration. */
87-
/*!< Uncomment the following line if you need to relocate the vector table
88-
anywhere in Flash or Sram, else the vector table is kept at the automatic
89-
remap of boot address selected */
90-
/* #define USER_VECT_TAB_ADDRESS */
80+
/*!< Uncomment the following line and change the address
81+
if you need to relocate your vector Table at a custom base address (+ VECT_TAB_OFFSET) */
82+
/* #define VECT_TAB_BASE_ADDRESS 0x08000000 */
9183

92-
#if defined(USER_VECT_TAB_ADDRESS)
84+
#if !defined(VECT_TAB_OFFSET)
85+
#define VECT_TAB_OFFSET 0x00000000U /*!< Vector Table base offset field.
86+
This value must be a multiple of 0x100. */
87+
#endif /* VECT_TAB_OFFSET */
88+
#if !defined(VECT_TAB_BASE_ADDRESS)
9389
/*!< Uncomment the following line if you need to relocate your vector Table
9490
in SRAM else user remap will be done in FLASH. */
9591
/* #define VECT_TAB_SRAM */
9692
#if defined(VECT_TAB_SRAM)
9793
#define VECT_TAB_BASE_ADDRESS SRAM_BASE /*!< Vector Table base address field.
9894
This value must be a multiple of 0x100. */
99-
#define VECT_TAB_OFFSET 0x00000000U /*!< Vector Table base offset field.
100-
This value must be a multiple of 0x100. */
10195
#else
10296
#define VECT_TAB_BASE_ADDRESS FLASH_BASE /*!< Vector Table base address field.
10397
This value must be a multiple of 0x100. */
104-
#define VECT_TAB_OFFSET 0x00000000U /*!< Vector Table base offset field.
105-
This value must be a multiple of 0x100. */
10698
#endif /* VECT_TAB_SRAM */
107-
#endif /* USER_VECT_TAB_ADDRESS */
108-
99+
#endif /* VECT_TAB_BASE_ADDRESS */
109100
/******************************************************************************/
110101

111102
/*!< HW TRIMMING Defines */
@@ -209,11 +200,7 @@ void SystemInit(void)
209200
}
210201

211202
/* Configure the Vector Table location */
212-
#if defined(USER_VECT_TAB_ADDRESS)
213203
SCB->VTOR = VECT_TAB_BASE_ADDRESS | VECT_TAB_OFFSET; /* Vector Table Relocation */
214-
#else
215-
SCB->VTOR = (uint32_t) (__vector_table);
216-
#endif /* USER_VECT_TAB_ADDRESS */
217204

218205
/* Store in RAM the AppBase information */
219206
RAM_VR.AppBase = (uint32_t) SCB->VTOR;

0 commit comments

Comments
 (0)