summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucian Copeland <hierophect@gmail.com>2020-02-06 18:47:06 -0500
committerLucian Copeland <hierophect@gmail.com>2020-02-06 18:47:06 -0500
commit41b5f737850d77fc56f9272159dc7765f5942968 (patch)
tree280ece251958108e3d86b3fd6f57b1632792e6d4
parentaee26b1c79e23b723b73857b31a77a3431956ab4 (diff)
revert mixed up linkers
-rw-r--r--ports/stm32f4/boards/STM32F401xd_fs.ld4
-rw-r--r--ports/stm32f4/boards/STM32F401xe_boot.ld (renamed from ports/stm32f4/boards/STM32F401_boot.ld)0
-rw-r--r--ports/stm32f4/boards/STM32F401xe_fs.ld (renamed from ports/stm32f4/boards/STM32F401_fs.ld)4
-rw-r--r--ports/stm32f4/boards/meowbit_v121/mpconfigboard.mk4
4 files changed, 6 insertions, 6 deletions
diff --git a/ports/stm32f4/boards/STM32F401xd_fs.ld b/ports/stm32f4/boards/STM32F401xd_fs.ld
index fd30e1622..c42dfcca8 100644
--- a/ports/stm32f4/boards/STM32F401xd_fs.ld
+++ b/ports/stm32f4/boards/STM32F401xd_fs.ld
@@ -5,10 +5,10 @@
/* Specify the memory areas */
MEMORY
{
- FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 512K /* entire flash */
+ FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 384K /* entire flash */
FLASH_ISR (rx) : ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
FLASH_FS (rx) : ORIGIN = 0x08004000, LENGTH = 48K /* sectors 1,2,3 are 16K */
- FLASH_TEXT (rx) : ORIGIN = 0x08010000, LENGTH = 448K /* sector 4 is 64K, sectors 5,6,7 are 128K */
+ FLASH_TEXT (rx) : ORIGIN = 0x08010000, LENGTH = 320K /* sector 4 is 64K, sectors 5,6,7 are 128K */
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 96K
}
diff --git a/ports/stm32f4/boards/STM32F401_boot.ld b/ports/stm32f4/boards/STM32F401xe_boot.ld
index 125d785fc..125d785fc 100644
--- a/ports/stm32f4/boards/STM32F401_boot.ld
+++ b/ports/stm32f4/boards/STM32F401xe_boot.ld
diff --git a/ports/stm32f4/boards/STM32F401_fs.ld b/ports/stm32f4/boards/STM32F401xe_fs.ld
index c42dfcca8..fd30e1622 100644
--- a/ports/stm32f4/boards/STM32F401_fs.ld
+++ b/ports/stm32f4/boards/STM32F401xe_fs.ld
@@ -5,10 +5,10 @@
/* Specify the memory areas */
MEMORY
{
- FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 384K /* entire flash */
+ FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 512K /* entire flash */
FLASH_ISR (rx) : ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
FLASH_FS (rx) : ORIGIN = 0x08004000, LENGTH = 48K /* sectors 1,2,3 are 16K */
- FLASH_TEXT (rx) : ORIGIN = 0x08010000, LENGTH = 320K /* sector 4 is 64K, sectors 5,6,7 are 128K */
+ FLASH_TEXT (rx) : ORIGIN = 0x08010000, LENGTH = 448K /* sector 4 is 64K, sectors 5,6,7 are 128K */
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 96K
}
diff --git a/ports/stm32f4/boards/meowbit_v121/mpconfigboard.mk b/ports/stm32f4/boards/meowbit_v121/mpconfigboard.mk
index dce69276d..16268ba11 100644
--- a/ports/stm32f4/boards/meowbit_v121/mpconfigboard.mk
+++ b/ports/stm32f4/boards/meowbit_v121/mpconfigboard.mk
@@ -19,6 +19,6 @@ MCU_VARIANT = stm32f4
MCU_SUB_VARIANT = stm32f401xe
MCU_PACKAGE = 64
CMSIS_MCU = STM32F401xE
-LD_FILE = boards/STM32F401_boot.ld
-# LD_FILE = boards/STM32F401_fs.ld # use for internal flash
+LD_FILE = boards/STM32F401xe_boot.ld
+# LD_FILE = boards/STM32F401xe_fs.ld # use for internal flash