Skip to content

system(H7): allow VECT_TAB_BASE_ADDRESS redefinition #2061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion system/STM32H7xx/system_stm32h7xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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 */


/******************************************************************************/
Expand Down
5 changes: 4 additions & 1 deletion system/STM32WLxx/system_stm32wlxx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

/**
Expand Down