Skip to content

Commit 61944ef

Browse files
committed
Merge branch 'stm32-loader-linkers' into stm32-f407-disco
2 parents 19553b8 + cabc3aa commit 61944ef

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

ports/stm32f4/boards/STM32F405_boot.ld

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ MEMORY
1717
_minimum_stack_size = 2K;
1818
_minimum_heap_size = 16K;
1919

20-
/* Define tho top end of the stack. The stack is full descending so begins just
20+
/* Define the top end of the stack. The stack is full descending so begins just
2121
above last byte of RAM. Note that EABI requires the stack to be 8-byte
2222
aligned for a call. */
2323
_estack = ORIGIN(RAM) + LENGTH(RAM);
@@ -105,4 +105,3 @@ SECTIONS
105105
.ARM.attributes 0 : { *(.ARM.attributes) }
106106
}
107107

108-

ports/stm32f4/boards/feather_stm32f405_express/mpconfigboard.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ MCU_SUB_VARIANT = stm32f405xx
1515
MCU_PACKAGE = 64
1616
CMSIS_MCU = STM32F405xx
1717

18-
LD_FS = boards/STM32F405_fs.ld # Default to internal FS
18+
# Default includes filesystem, but uses external flash
19+
LD_FS = boards/STM32F405_fs.ld
1920
LD_BOOT = boards/STM32F405_boot.ld # UF2 boot option
2021
UF2_OFFSET = 0x8010000
2122

ports/stm32f4/boards/pyboard_v11/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ MCU_VARIANT = stm32f4
1212
MCU_SUB_VARIANT = stm32f405xx
1313
MCU_PACKAGE = 64
1414
CMSIS_MCU = STM32F405xx
15-
LD_FILE = boards/STM32F405.ld
15+
LD_FILE = boards/STM32F405_fs.ld
1616

0 commit comments

Comments
 (0)