Merge pull request #2061 from fpistm/H7_VECT_TAB_BASE_ADDRESS

fpistm · web-flow · commit baf3e2d2fde9 · 2023-07-10T15:49:32.000+02:00
system(H7): allow VECT_TAB_BASE_ADDRESS redefinition
system(WL): allow VECT_TAB_BASE_ADDRESS redefinition
diff --git a/system/STM32H7xx/system_stm32h7xx.c b/system/STM32H7xx/system_stm32h7xx.c
@@ -81,6 +81,7 @@
                                                      This value must be a multiple of 0x300. */
 #endif
 
+#ifndef VECT_TAB_BASE_ADDRESS
 #if defined(DUAL_CORE) && defined(CORE_CM4)
 #if defined(VECT_TAB_SRAM)
 #define VECT_TAB_BASE_ADDRESS   D2_AXISRAM_BASE   /*!< Vector Table base address field.
@@ -99,7 +100,7 @@
                                                        This value must be a multiple of 0x300. */
 #endif /* VECT_TAB_SRAM */
 #endif /* DUAL_CORE && CORE_CM4 */
-
+#endif /* !VECT_TAB_BASE_ADDRESS */
 
 
 /******************************************************************************/
diff --git a/system/STM32WLxx/system_stm32wlxx.c b/system/STM32WLxx/system_stm32wlxx.c
@@ -117,26 +117,29 @@
 #define VECT_TAB_OFFSET         0x00008000U     /*!< Vector Table base offset field.
                                                      This value must be a multiple of 0x100. */
 #endif
+#ifndef VECT_TAB_BASE_ADDRESS
 #if defined(VECT_TAB_SRAM)
 #define VECT_TAB_BASE_ADDRESS   SRAM2_BASE      /*!< Vector Table base address field.
                                                      This value must be a multiple of 0x100. */
 #else
 #define VECT_TAB_BASE_ADDRESS   FLASH_BASE      /*!< Vector Table base address field.
                                                      This value must be a multiple of 0x100. */
 #endif /* VECT_TAB_SRAM */
-
+#endif /* !VECT_TAB_BASE_ADDRESS */
 #else /* CORE_CM4 */
 #ifndef VECT_TAB_OFFSET
 #define VECT_TAB_OFFSET         0x00000000U     /*!< Vector Table base offset field.
                                                      This value must be a multiple of 0x100. */
 #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 0x100. */
 #else
 #define VECT_TAB_BASE_ADDRESS   FLASH_BASE      /*!< Vector Table base address field.
                                                      This value must be a multiple of 0x100. */
 #endif /* VECT_TAB_SRAM */
+#endif /* !VECT_TAB_BASE_ADDRESS */
 #endif /* CORE_CM0PLUS */
 
 /**
