reworks memory map for flash

m-mcgowan · m-mcgowan · commit 2a05b22f4228 · 2021-09-28T18:52:02.000-07:00
diff --git a/ports/stm/boards/STM32L4R5_boot.ld b/ports/stm/boards/STM32L4R5_boot.ld
@@ -5,9 +5,10 @@
 /* Specify the memory areas */
 MEMORY
 {
-    FLASH (rx)          : ORIGIN = 0x08010000, LENGTH = 2048K - 64K         /* entire flash, sans bootloader region */
-    FLASH_ISR (rx)      : ORIGIN = 0x08010000, LENGTH = 64K                 /* sector 0 */
-    FLASH_FIRMWARE (rx) : ORIGIN = 0x08020000, LENGTH = 2048K - 64K - 64K   /* sectors 5+ */
+    FLASH (rx)          : ORIGIN = 0x08000000, LENGTH = 2048K /* entire flash */
+    FLASH_ISR (rx)      : ORIGIN = 0x08010000, LENGTH = 4K /* ISR vector. Kind of wasteful. */
+    FLASH_FIRMWARE (rx) : ORIGIN = 0x08011000, LENGTH = 1024K-128K-64K-4K  /* For now, limit to 1MB so that bank switching is still possible. */
+    FLASH_FS (rw)       : ORIGIN = 0x080e0000, LENGTH = 128K
     RAM (xrw)           : ORIGIN = 0x20000000, LENGTH = 640K
 }
 
diff --git a/ports/stm/boards/STM32L4R5_default.ld b/ports/stm/boards/STM32L4R5_default.ld
@@ -6,9 +6,9 @@
 MEMORY
 {
     FLASH (rx)          : ORIGIN = 0x08000000, LENGTH = 2048K /* entire flash */
-    FLASH_ISR (rx)      : ORIGIN = 0x08000000, LENGTH = 4K   /* todo - wasteful with 4K pages. */
-    FLASH_FIRMWARE (rx) : ORIGIN = 0x08010000, LENGTH = 1024K-128K-64K
-    
+    FLASH_ISR (rx)      : ORIGIN = 0x08000000, LENGTH = 4K /* ISR vector. Kind of wasteful. */
+    FLASH_FIRMWARE (rx) : ORIGIN = 0x08001000, LENGTH = 1024K-128K-4K  /* For now, limit to 1MB so that bank switching is still possible. */
+    FLASH_FS (rw)       : ORIGIN = 0x080e0000, LENGTH = 128K
     RAM (xrw)           : ORIGIN = 0x20000000, LENGTH = 640K
 }
 

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,10 @@`
`5`	`5`	`/* Specify the memory areas */`
`6`	`6`	`MEMORY`
`7`	`7`	`{`
`8`		`- FLASH (rx) : ORIGIN = 0x08010000, LENGTH = 2048K - 64K /* entire flash, sans bootloader region */`
`9`		`- FLASH_ISR (rx) : ORIGIN = 0x08010000, LENGTH = 64K /* sector 0 */`
`10`		`- FLASH_FIRMWARE (rx) : ORIGIN = 0x08020000, LENGTH = 2048K - 64K - 64K /* sectors 5+ */`
	`8`	`+ FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 2048K /* entire flash */`
	`9`	`+ FLASH_ISR (rx) : ORIGIN = 0x08010000, LENGTH = 4K /* ISR vector. Kind of wasteful. */`
	`10`	`+ FLASH_FIRMWARE (rx) : ORIGIN = 0x08011000, LENGTH = 1024K-128K-64K-4K /* For now, limit to 1MB so that bank switching is still possible. */`
	`11`	`+ FLASH_FS (rw) : ORIGIN = 0x080e0000, LENGTH = 128K`
`11`	`12`	`RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 640K`
`12`	`13`	`}`
`13`	`14`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@`
`6`	`6`	`MEMORY`
`7`	`7`	`{`
`8`	`8`	`FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 2048K /* entire flash */`
`9`		`- FLASH_ISR (rx) : ORIGIN = 0x08000000, LENGTH = 4K /* todo - wasteful with 4K pages. */`
`10`		`- FLASH_FIRMWARE (rx) : ORIGIN = 0x08010000, LENGTH = 1024K-128K-64K`
`11`		`-`
	`9`	`+ FLASH_ISR (rx) : ORIGIN = 0x08000000, LENGTH = 4K /* ISR vector. Kind of wasteful. */`
	`10`	`+ FLASH_FIRMWARE (rx) : ORIGIN = 0x08001000, LENGTH = 1024K-128K-4K /* For now, limit to 1MB so that bank switching is still possible. */`
	`11`	`+ FLASH_FS (rw) : ORIGIN = 0x080e0000, LENGTH = 128K`
`12`	`12`	`RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 640K`
`13`	`13`	`}`
`14`	`14`