Remove filesystem from linker script.

Author: jgillick

ports/stm/boards/STM32F411_nvm_flash.ld renamed to ports/stm/boards/STM32F411_nvm_nofs.ld

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

ports/stm/boards/thunderpack_v12/mpconfigboard.h

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

ports/stm/boards/thunderpack_v12/mpconfigboard.mk

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