rp2: Make FLASH LENGTH match PICO_FLASH_SIZE_BYTES in .ld files.

sfe-SparkFro · sfe-SparkFro · commit 83c8f529cdaa · 2025-05-22T14:52:58.000-06:00
Signed-off-by: Dryw Wade &lt;dryw.wade@sparkfun.com&gt;
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
@@ -525,6 +525,7 @@ target_compile_options(${MICROPY_TARGET} PRIVATE
 
 target_link_options(${MICROPY_TARGET} PRIVATE
     -Wl,--defsym=__micropy_c_heap_size__=${MICROPY_C_HEAP_SIZE}
+    -Wl,--defsym=__micropy_flash_size__=${PICO_FLASH_SIZE_BYTES}
     -Wl,--wrap=dcd_event_handler
     -Wl,--wrap=runtime_init_clocks
 )
diff --git a/ports/rp2/memmap_mp_rp2040.ld b/ports/rp2/memmap_mp_rp2040.ld
@@ -23,7 +23,7 @@
 
 MEMORY
 {
-    FLASH(rx) : ORIGIN = 0x10000000, LENGTH = 2048k
+    FLASH(rx) : ORIGIN = 0x10000000, LENGTH = __micropy_flash_size__
     RAM(rwx) : ORIGIN =  0x20000000, LENGTH = 256k
     SCRATCH_X(rwx) : ORIGIN = 0x20040000, LENGTH = 4k
     SCRATCH_Y(rwx) : ORIGIN = 0x20041000, LENGTH = 4k
diff --git a/ports/rp2/memmap_mp_rp2350.ld b/ports/rp2/memmap_mp_rp2350.ld
@@ -23,7 +23,7 @@
 
 MEMORY
 {
-    FLASH(rx) : ORIGIN = 0x10000000, LENGTH = 4096k
+    FLASH(rx) : ORIGIN = 0x10000000, LENGTH = __micropy_flash_size__
     RAM(rwx) : ORIGIN =  0x20000000, LENGTH = 512k
     SCRATCH_X(rwx) : ORIGIN = 0x20080000, LENGTH = 4k
     SCRATCH_Y(rwx) : ORIGIN = 0x20081000, LENGTH = 4k

Original file line number	Diff line number	Diff line change
`@@ -525,6 +525,7 @@ target_compile_options(${MICROPY_TARGET} PRIVATE`
`525`	`525`
`526`	`526`	`target_link_options(${MICROPY_TARGET} PRIVATE`
`527`	`527`	`-Wl,--defsym=__micropy_c_heap_size__=${MICROPY_C_HEAP_SIZE}`
	`528`	`+ -Wl,--defsym=__micropy_flash_size__=${PICO_FLASH_SIZE_BYTES}`
`528`	`529`	`-Wl,--wrap=dcd_event_handler`
`529`	`530`	`-Wl,--wrap=runtime_init_clocks`
`530`	`531`	`)`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`MEMORY`
`25`	`25`	`{`
`26`		`- FLASH(rx) : ORIGIN = 0x10000000, LENGTH = 2048k`
	`26`	`+ FLASH(rx) : ORIGIN = 0x10000000, LENGTH = __micropy_flash_size__`
`27`	`27`	`RAM(rwx) : ORIGIN = 0x20000000, LENGTH = 256k`
`28`	`28`	`SCRATCH_X(rwx) : ORIGIN = 0x20040000, LENGTH = 4k`
`29`	`29`	`SCRATCH_Y(rwx) : ORIGIN = 0x20041000, LENGTH = 4k`