Skip to content

Commit baf3e2d

Browse files
authoredJul 10, 2023
Merge pull request #2061 from fpistm/H7_VECT_TAB_BASE_ADDRESS
system(H7): allow VECT_TAB_BASE_ADDRESS redefinition system(WL): allow VECT_TAB_BASE_ADDRESS redefinition
2 parents b0ac294 + 3b1bd3b commit baf3e2d

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed
 

‎system/STM32H7xx/system_stm32h7xx.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
This value must be a multiple of 0x300. */
8282
#endif
8383

84+
#ifndef VECT_TAB_BASE_ADDRESS
8485
#if defined(DUAL_CORE) && defined(CORE_CM4)
8586
#if defined(VECT_TAB_SRAM)
8687
#define VECT_TAB_BASE_ADDRESS D2_AXISRAM_BASE /*!< Vector Table base address field.
@@ -99,7 +100,7 @@
99100
This value must be a multiple of 0x300. */
100101
#endif /* VECT_TAB_SRAM */
101102
#endif /* DUAL_CORE && CORE_CM4 */
102-
103+
#endif /* !VECT_TAB_BASE_ADDRESS */
103104

104105

105106
/******************************************************************************/

‎system/STM32WLxx/system_stm32wlxx.c

+4-1
Original file line numberDiff line numberDiff line change
@@ -117,26 +117,29 @@
117117
#define VECT_TAB_OFFSET 0x00008000U /*!< Vector Table base offset field.
118118
This value must be a multiple of 0x100. */
119119
#endif
120+
#ifndef VECT_TAB_BASE_ADDRESS
120121
#if defined(VECT_TAB_SRAM)
121122
#define VECT_TAB_BASE_ADDRESS SRAM2_BASE /*!< Vector Table base address field.
122123
This value must be a multiple of 0x100. */
123124
#else
124125
#define VECT_TAB_BASE_ADDRESS FLASH_BASE /*!< Vector Table base address field.
125126
This value must be a multiple of 0x100. */
126127
#endif /* VECT_TAB_SRAM */
127-
128+
#endif /* !VECT_TAB_BASE_ADDRESS */
128129
#else /* CORE_CM4 */
129130
#ifndef VECT_TAB_OFFSET
130131
#define VECT_TAB_OFFSET 0x00000000U /*!< Vector Table base offset field.
131132
This value must be a multiple of 0x100. */
132133
#endif
134+
#ifndef VECT_TAB_BASE_ADDRESS
133135
#if defined(VECT_TAB_SRAM)
134136
#define VECT_TAB_BASE_ADDRESS SRAM1_BASE /*!< Vector Table base address field.
135137
This value must be a multiple of 0x100. */
136138
#else
137139
#define VECT_TAB_BASE_ADDRESS FLASH_BASE /*!< Vector Table base address field.
138140
This value must be a multiple of 0x100. */
139141
#endif /* VECT_TAB_SRAM */
142+
#endif /* !VECT_TAB_BASE_ADDRESS */
140143
#endif /* CORE_CM0PLUS */
141144

142145
/**

0 commit comments

Comments
 (0)