From 5c9e51bb5f69c181a92416ac46df9b21f71a8781 Mon Sep 17 00:00:00 2001 From: mikeller Date: Sun, 18 Aug 2019 16:12:33 +1200 Subject: [PATCH] Fix extended custom defaults. --- src/link/stm32_flash_f405.ld | 2 +- src/link/stm32_flash_f411.ld | 4 ++-- src/link/stm32_flash_f74x.ld | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/link/stm32_flash_f405.ld b/src/link/stm32_flash_f405.ld index d1b9fa652..4658828ac 100644 --- a/src/link/stm32_flash_f405.ld +++ b/src/link/stm32_flash_f405.ld @@ -22,7 +22,7 @@ MEMORY FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 10K FLASH_CUSTOM_DEFAULTS (r) : ORIGIN = 0x08002800, LENGTH = 6K FLASH_CONFIG (r) : ORIGIN = 0x08004000, LENGTH = 16K - FLASH1 (rx) : ORIGIN = 0x08008000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS) ? 976K : 992K + FLASH1 (rx) : ORIGIN = 0x08008000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 976K : 992K FLASH_CUSTOM_DEFAULTS_EXTENDED (r): ORIGIN = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 0x080FC000 : 0x08100000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 16K : 0K SYSTEM_MEMORY (rx): ORIGIN = 0x1FFF0000, LENGTH = 29K diff --git a/src/link/stm32_flash_f411.ld b/src/link/stm32_flash_f411.ld index 43d4cd816..b5275e296 100644 --- a/src/link/stm32_flash_f411.ld +++ b/src/link/stm32_flash_f411.ld @@ -23,8 +23,8 @@ MEMORY FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 10K FLASH_CUSTOM_DEFAULTS (r) : ORIGIN = 0x08002800, LENGTH = 6K FLASH_CONFIG (r) : ORIGIN = 0x08004000, LENGTH = 16K - FLASH1 (rx) : ORIGIN = 0x08008000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS) ? 464K : 480K - FLASH_CUSTOM_DEFAULTS_EXTENDED (r): ORIGIN = DEFINED(USE_CUSTOM_DEFAULTS) ? 0x0807C000 : 0x08080000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 16K : 0K + FLASH1 (rx) : ORIGIN = 0x08008000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 464K : 480K + FLASH_CUSTOM_DEFAULTS_EXTENDED (r): ORIGIN = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 0x0807C000 : 0x08080000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 16K : 0K SYSTEM_MEMORY (rx): ORIGIN = 0x1FFF0000, LENGTH = 29K diff --git a/src/link/stm32_flash_f74x.ld b/src/link/stm32_flash_f74x.ld index 0ed73b0d9..9924b15be 100644 --- a/src/link/stm32_flash_f74x.ld +++ b/src/link/stm32_flash_f74x.ld @@ -31,7 +31,7 @@ MEMORY AXIM_FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 10K AXIM_FLASH_CUSTOM_DEFAULTS (r) : ORIGIN = 0x08002800, LENGTH = 22K AXIM_FLASH_CONFIG (r) : ORIGIN = 0x08008000, LENGTH = 32K - AXIM_FLASH1 (rx) : ORIGIN = 0x08010000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS) ? 928K : 960K + AXIM_FLASH1 (rx) : ORIGIN = 0x08010000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 928K : 960K AXIM_FLASH_CUSTOM_DEFAULTS_EXTENDED (r) : ORIGIN = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 0x080F8000 : 0x08100000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 32K : 0K DTCM_RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 64K