Skip to content

fix(WL): wrong arm cortex math library and VECT_TAB_OFFSET used for CM4 #1665

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.

Sign up for GitHub

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
Mar 1, 2022
Merged

fix(WL): wrong arm cortex math library and VECT_TAB_OFFSET used for CM4 #1665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5dcced4
fix(WL): wrong arm cortexM4 math library
fpistm Feb 23, 2022
9be247a
fix(WL): wrong VECT_TAB_OFFSET for CORE_CM4
fpistm Feb 23, 2022
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
4 changes: 2 additions & 2 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ Nucleo_64.menu.pnum.NUCLEO_WL55JC1.build.board=NUCLEO_WL55JC1
Nucleo_64.menu.pnum.NUCLEO_WL55JC1.build.series=STM32WLxx
Nucleo_64.menu.pnum.NUCLEO_WL55JC1.build.product_line=STM32WLE5xx
Nucleo_64.menu.pnum.NUCLEO_WL55JC1.build.variant=STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I
Nucleo_64.menu.pnum.NUCLEO_WL55JC1.build.cmsis_lib_gcc=arm_cortexM4lf_math
Nucleo_64.menu.pnum.NUCLEO_WL55JC1.build.cmsis_lib_gcc=arm_cortexM4l_math
Nucleo_64.menu.pnum.NUCLEO_WL55JC1.build.extra_flags=-D{build.product_line} -DUSE_CM4_STARTUP_FILE {build.xSerial}

# Upload menu
Expand Down Expand Up @@ -5487,7 +5487,7 @@ GenWL.build.extra_flags=-D{build.product_line} -DUSE_CM4_STARTUP_FILE {build.xSe
GenWL.build.mcu=cortex-m4
#GenWL.build.flags.fp=-mfpu=fpv4-sp-d16 -mfloat-abi=hard
GenWL.build.series=STM32WLxx
GenWL.build.cmsis_lib_gcc=arm_cortexM4lf_math
GenWL.build.cmsis_lib_gcc=arm_cortexM4l_math

# Generic node SE by The Things Industries
GenWL.menu.pnum.GENERIC_NODE_SE_TTI=Generic Node SE (TTI)
Expand Down
7 changes: 5 additions & 2 deletions system/STM32WLxx/system_stm32wlxx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,11 @@
in Sram else user remap will be done by default in Flash. */
/* #define VECT_TAB_SRAM */

#if defined(CORE_CM0PLUS)
#ifndef VECT_TAB_OFFSET
#define VECT_TAB_OFFSET 0x00008000U /*!< Vector Table base offset field.
This value must be a multiple of 0x100. */
#endif

#if defined(CORE_CM0PLUS)
#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. */
Expand All @@ -127,6 +126,10 @@
#endif /* VECT_TAB_SRAM */

#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
#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. */
Expand Down