update LD files for cygnet

blues · Nov 7, 2024 · 5a3f9d7 · 5a3f9d7
1 parent fe12f2b
commit 5a3f9d7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 22 deletions.
diff --git a/ports/stm/boards/STM32L433_boot.ld b/ports/stm/boards/STM32L433_boot.ld
@@ -3,23 +3,12 @@
 */
 
 /* Specify the memory areas */
-/*
-MEMORY
-{
-    FLASH (rx)          : ORIGIN = 0x08000000, LENGTH = 256k
-    FLASH_ISR (rx)      : ORIGIN = 0x08010000, LENGTH = 4K
-    FLASH_FIRMWARE (rx) : ORIGIN = 0x08011000, LENGTH = 156K-64K-4K
-    FLASH_FS (rw)       : ORIGIN = 0x08027000, LENGTH = 88K
-    RAM (xrw)           : ORIGIN = 0x20000000, LENGTH = 64K
-}
-*/
-
 MEMORY
 {
-    FLASH (rx)          : ORIGIN = 0x08000000, LENGTH = 2048K /* entire flash */
+    FLASH (rx)          : ORIGIN = 0x08000000, LENGTH = 256k /* 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 = 0x08100000, LENGTH = 1024K
+    FLASH_FIRMWARE (rx) : ORIGIN = 0x08011000, LENGTH = 192K-64K-4K  /* For now, limit to 1MB so that bank switching is still possible. */
+    FLASH_FS (rw)       : ORIGIN = 0x08030000, LENGTH = 60K
     RAM (xrw)           : ORIGIN = 0x20000000, LENGTH = 640K
 }
 

diff --git a/ports/stm/boards/STM32L433_default.ld b/ports/stm/boards/STM32L433_default.ld
@@ -7,12 +7,8 @@ MEMORY
 {
     FLASH (rx)          : ORIGIN = 0x08000000, LENGTH = 256K /* entire flash */
     FLASH_ISR (rx)      : ORIGIN = 0x08000000, LENGTH = 4K /* ISR vector. Kind of wasteful. */
-    /*
-    FLASH_FIRMWARE (rx) : ORIGIN = 0x08001000, LENGTH = 60K
-    FLASH_FS (rw)       : ORIGIN = 0x08010000, LENGTH = 60K
-    */
-    FLASH_FIRMWARE (rx) : ORIGIN = 0x08001000, LENGTH = 4K
-    FLASH_FS (rw)       : ORIGIN = 0x08004000, LENGTH = 60K
+    FLASH_FIRMWARE (rx) : ORIGIN = 0x08001000, LENGTH = 128K - 4K
+    FLASH_FS (rw)       : ORIGIN = 0x08020000, LENGTH = 128K
     RAM (xrw)           : ORIGIN = 0x20000000, LENGTH = 64K
 }
 

diff --git a/ports/stm/boards/cygnet/mpconfigboard.mk b/ports/stm/boards/cygnet/mpconfigboard.mk
@@ -19,7 +19,7 @@ INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
 
-USB_NUM_ENDPOINT_PAIRS = 0
+USB_NUM_ENDPOINT_PAIRS = 8
 
 CIRCUITPY_ALARM = 0
 CIRCUITPY_ANALOGIO = 1
@@ -52,8 +52,8 @@ CIRCUITPY_RTC = 1
 CIRCUITPY_SDCARDIO = 0
 CIRCUITPY_STORAGE = 1
 CIRCUITPY_TOUCHIO = 0
-CIRCUITPY_UDB_CDC = 1
 CIRCUITPY_ULAB = 1
+CIRCUITPY_UDB_CDC = 1
 CIRCUITPY_USB_HID = 0
 CIRCUITPY_USB_MIDI = 0
 CIRCUITPY_USB_MSC = 1