Remove filesystem from linker script.

This commit is contained in:
jgillick 2020-11-23 22:56:38 -08:00
parent 570353b946
commit f8499a468e
3 changed files with 7 additions and 9 deletions

View File

@ -1,7 +1,6 @@
/* /*
GNU linker script for STM32F411 with nvm and an external flash chip, and reserves GNU linker script for STM32F411 with nvm and an external flash chip.
more space for the CircuitPython firmware and less for the filesystem No space is reserved for a filesystem.
(since the filesystem will be on the external flash chip).
*/ */
/* Specify the memory areas */ /* Specify the memory areas */
@ -9,9 +8,8 @@ MEMORY
{ {
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 512K /* entire flash */ FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 512K /* entire flash */
FLASH_ISR (rx) : ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */ FLASH_ISR (rx) : ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
FLASH_FS (rx) : ORIGIN = 0x08004000, LENGTH = 32K /* sectors 1,2 are 16K */ FLASH_NVM (rwx) : ORIGIN = 0x08004000, LENGTH = 16K /* sector 1 is 16K */
FLASH_NVM (rwx) : ORIGIN = 0x0800C000, LENGTH = 16K /* sector 3 is 16K */ FLASH_FIRMWARE (rx) : ORIGIN = 0x08008000, LENGTH = 480K /* sector 2,3 is 16k, sector 4 is 64K, sectors 5,6,7 are 128K */
FLASH_FIRMWARE (rx) : ORIGIN = 0x08010000, LENGTH = 448K /* sector 4 is 64K, sectors 5,6,7 are 128K */
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 128K RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 128K
} }

View File

@ -28,8 +28,8 @@
// Non-volatile memory config // Non-volatile memory config
#define CIRCUITPY_INTERNAL_NVM_SIZE (0x4000) #define CIRCUITPY_INTERNAL_NVM_SIZE (0x4000)
#define CIRCUITPY_INTERNAL_NVM_START_ADDR (0x0800C000) #define CIRCUITPY_INTERNAL_NVM_START_ADDR (0x08004000)
#define CIRCUITPY_INTERNAL_NVM_SECTOR FLASH_SECTOR_3 #define CIRCUITPY_INTERNAL_NVM_SECTOR FLASH_SECTOR_1
#define NVM_BYTEARRAY_BUFFER_SIZE 512 #define NVM_BYTEARRAY_BUFFER_SIZE 512
// Flash config // Flash config

View File

@ -18,4 +18,4 @@ MCU_VARIANT = STM32F411xE
MCU_PACKAGE = UFQFPN48 MCU_PACKAGE = UFQFPN48
LD_COMMON = boards/common_nvm.ld LD_COMMON = boards/common_nvm.ld
LD_FILE = boards/STM32F411_nvm_flash.ld LD_FILE = boards/STM32F411_nvm_nofs.ld