diff options
| author | Damien George <damien@micropython.org> | 2021-04-06 12:11:15 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2021-04-06 12:11:15 +1000 |
| commit | 25ae169e6ec5ada4d80f6632b72b711c0b5e4c98 (patch) | |
| tree | 88d393b00a91dc40347db3e800e922e475035053 | |
| parent | 2d8aecd2ad43afeeb14fb8a21fcff29a1000c5c4 (diff) | |
stm32: Include .ARM section in firmware for C++ exception handling.
Support for C++ was added in 97960dc7deb7a0e691fca5944402cd03386b744b but
that commit didn't include the C++ exception handling table in the binary
firmware image. This commit fixes that.
Signed-off-by: Damien George <damien@micropython.org>
| -rw-r--r-- | ports/stm32/Makefile | 4 | ||||
| -rw-r--r-- | ports/stm32/boards/PYBD_SF2/mpconfigboard.mk | 2 | ||||
| -rw-r--r-- | ports/stm32/boards/PYBD_SF3/mpconfigboard.mk | 2 | ||||
| -rw-r--r-- | ports/stm32/boards/STM32F769DISC/mpconfigboard.mk | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile index 6c71f2757..9c22928a0 100644 --- a/ports/stm32/Makefile +++ b/ports/stm32/Makefile @@ -643,7 +643,7 @@ TEXT0_ADDR ?= 0x08000000 ifeq ($(TEXT1_ADDR),) # No TEXT1_ADDR given so put all firmware at TEXT0_ADDR location -TEXT0_SECTIONS ?= .isr_vector .text .data +TEXT0_SECTIONS ?= .isr_vector .text .data .ARM deploy-stlink: $(BUILD)/firmware.bin $(call RUN_STLINK,$^,$(TEXT0_ADDR)) @@ -661,7 +661,7 @@ else # TEXT0_ADDR and TEXT1_ADDR are specified so split firmware between these locations TEXT0_SECTIONS ?= .isr_vector -TEXT1_SECTIONS ?= .text .data +TEXT1_SECTIONS ?= .text .data .ARM deploy-stlink: $(BUILD)/firmware0.bin $(BUILD)/firmware1.bin $(call RUN_STLINK,$(word 1,$^),$(TEXT0_ADDR)) diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.mk b/ports/stm32/boards/PYBD_SF2/mpconfigboard.mk index ead8bb8c0..9917aa2c5 100644 --- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.mk +++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.mk @@ -6,7 +6,7 @@ AF_FILE = boards/stm32f722_af.csv LD_FILES = boards/PYBD_SF2/f722_qspi.ld TEXT0_ADDR = 0x08008000 TEXT1_ADDR = 0x90000000 -TEXT0_SECTIONS = .isr_vector .text .data +TEXT0_SECTIONS = .isr_vector .text .data .ARM TEXT1_SECTIONS = .text_ext # MicroPython settings diff --git a/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk b/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk index abe3dcd86..6bcc68f4b 100644 --- a/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk +++ b/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk @@ -6,7 +6,7 @@ AF_FILE = boards/stm32f722_af.csv LD_FILES = boards/PYBD_SF2/f722_qspi.ld TEXT0_ADDR = 0x08008000 TEXT1_ADDR = 0x90000000 -TEXT0_SECTIONS = .isr_vector .text .data +TEXT0_SECTIONS = .isr_vector .text .data .ARM TEXT1_SECTIONS = .text_ext # MicroPython settings diff --git a/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk b/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk index 81add8c88..5d3d11a79 100644 --- a/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk +++ b/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk @@ -22,7 +22,7 @@ ifeq ($(USE_QSPI_XIP),1) LD_FILES = boards/STM32F769DISC/f769_qspi.ld TEXT0_ADDR = 0x08020000 TEXT1_ADDR = 0x90000000 -TEXT0_SECTIONS = .isr_vector .text .data +TEXT0_SECTIONS = .isr_vector .text .data .ARM TEXT1_SECTIONS = .text_qspi else |