Merge pull request micropython#21 from emfcamp/l4-flash-size

mattbrejza · web-flow · commit bbc3099e8bc1 · 2016-07-19T19:23:12.000+01:00
L4 flash size
diff --git a/stmhal/boards/STM32L475_EMFBADGE/mpconfigboard.h b/stmhal/boards/STM32L475_EMFBADGE/mpconfigboard.h
@@ -14,6 +14,7 @@
 #define MICROPY_HW_ENABLE_SERVO     (1)
 #define MICROPY_HW_HAS_UGFX         (1)
 #define MICROPY_HW_HAS_CC3100       (1)
+#define MICROPY_HW_L4_512_FS        (1)
 
 #define MICROPY_BOARD_EARLY_INIT    STM32L475_EMFBADGE_board_early_init
 void STM32L475_EMFBADGE_board_early_init(void);
diff --git a/stmhal/boards/STM32L476_EMFBADGE/mpconfigboard.h b/stmhal/boards/STM32L476_EMFBADGE/mpconfigboard.h
@@ -14,6 +14,7 @@
 #define MICROPY_HW_ENABLE_SERVO     (1)
 #define MICROPY_HW_HAS_UGFX         (1)
 #define MICROPY_HW_HAS_CC3100       (1)
+#define MICROPY_HW_L4_512_FS        (1)
 
 #define MICROPY_BOARD_EARLY_INIT    STM32L476_EMFBADGE_board_early_init
 void STM32L476_EMFBADGE_board_early_init(void);
diff --git a/stmhal/boards/stm32l475xg.ld b/stmhal/boards/stm32l475xg.ld
@@ -5,12 +5,14 @@
 /* Specify the memory areas */
 MEMORY
 {                                                   
-    FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 1024K
-    FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 0x0000800 /* sector 0, 2 KiB */
-    FLASH_FS (r)    : ORIGIN = 0x08000800, LENGTH = 0x001F800 /* sectors 1-63 (2K each = 126 KiB) */
-    FLASH_TEXT (rx) : ORIGIN = 0x08020000, LENGTH = 0x0080000 /* Sector starting @ 64 */
-    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 96K
-    SRAM2 (xrw)     : ORIGIN = 0x10000000, LENGTH = 32K
+    FLASH (rx)         : ORIGIN = 0x08000000, LENGTH = 0x0100000 /* entire flash, 1 MiB */
+    FLASH_ISR (rx)     : ORIGIN = 0x08000000, LENGTH = 0x0000800 /* sector 0, 2 KiB */
+    FLASH_FS (r)       : ORIGIN = 0x08000800, LENGTH = 0x001F800 /* sectors 1-63 (2K each = 126 KiB) */
+    FLASH_TEXT (rx)    : ORIGIN = 0x08020000, LENGTH = 0x0080000 /* Sector starting @ 64 */
+    FLASH_FS2 (r)      : ORIGIN = 0x080A0000, LENGTH = 0x0060000 /* Sector starting @ 320 (2K each = 384 KiB) */
+    RAM (xrw)          : ORIGIN = 0x20000000, LENGTH = 0x0018000 /* 96K */
+    SRAM2_FS_BUF (xrw) : ORIGIN = 0x10000000, LENGTH = 0x0000800 /* 2K, do not touch used directly by storage.c */
+    SRAM2 (xrw)        : ORIGIN = 0x10000800, LENGTH = 0x0007800 /* 30K */
 }
 
 ENTRY(Reset_Handler)
diff --git a/stmhal/boards/stm32l476xe.ld b/stmhal/boards/stm32l476xe.ld
@@ -10,7 +10,8 @@ MEMORY
     FLASH_FS (r)    : ORIGIN = 0x08000800, LENGTH = 0x001F800 /* sectors 1-63 (2K each = 126 KiB) */
     FLASH_TEXT (rx) : ORIGIN = 0x08020000, LENGTH = 0x0060000 /* Sector starting @ 64 */
     RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 96K
-    SRAM2 (xrw)     : ORIGIN = 0x10000000, LENGTH = 32K
+    SRAM2_FS_BUF (xrw) : ORIGIN = 0x10000000, LENGTH = 0x0000800 /* 2K, do not touch used directly by storage.c */
+    SRAM2 (xrw)        : ORIGIN = 0x10000800, LENGTH = 0x0007800 /* 30K */
 }
 
 ENTRY(Reset_Handler)
diff --git a/stmhal/boards/stm32l476xg.ld b/stmhal/boards/stm32l476xg.ld
@@ -5,12 +5,14 @@
 /* Specify the memory areas */
 MEMORY
 {                                                   
-    FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 1024K
-    FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 0x0000800 /* sector 0, 2 KiB */
-    FLASH_FS (r)    : ORIGIN = 0x08000800, LENGTH = 0x001F800 /* sectors 1-63 (2K each = 126 KiB) */
-    FLASH_TEXT (rx) : ORIGIN = 0x08020000, LENGTH = 0x0080000 /* Sector starting @ 64 */
-    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 96K
-    SRAM2 (xrw)     : ORIGIN = 0x10000000, LENGTH = 32K
+    FLASH (rx)         : ORIGIN = 0x08000000, LENGTH = 0x0100000 /* entire flash, 1 MiB */
+    FLASH_ISR (rx)     : ORIGIN = 0x08000000, LENGTH = 0x0000800 /* sector 0, 2 KiB */
+    FLASH_FS (r)       : ORIGIN = 0x08000800, LENGTH = 0x001F800 /* sectors 1-63 (2K each = 126 KiB) */
+    FLASH_TEXT (rx)    : ORIGIN = 0x08020000, LENGTH = 0x0080000 /* Sector starting @ 64 */
+    FLASH_FS2 (r)      : ORIGIN = 0x080A0000, LENGTH = 0x0060000 /* Sector starting @ 320 (2K each = 384 KiB) */
+    RAM (xrw)          : ORIGIN = 0x20000000, LENGTH = 0x0018000 /* 96K */
+    SRAM2_FS_BUF (xrw) : ORIGIN = 0x10000000, LENGTH = 0x0000800 /* 2K, do not touch used directly by storage.c */
+    SRAM2 (xrw)        : ORIGIN = 0x10000800, LENGTH = 0x0007800 /* 30K */
 }
 
 ENTRY(Reset_Handler)
diff --git a/stmhal/storage.c b/stmhal/storage.c
@@ -91,6 +91,11 @@ STATIC byte flash_cache_mem[0x4000] __attribute__((aligned(4))); // 16k
 #define FLASH_SECTOR_SIZE_MAX (0x00800)         // 2k max
 #define FLASH_MEM_SEG1_START_ADDR (0x08000800)  // sector 1
 #define FLASH_MEM_SEG1_NUM_BLOCKS (252)         // 1 Block=512 Bytes Reserve 126 kBytes
+// on the STM32L47xxG we have 1MB of flash so can enable a bigger FS
+#if defined(MICROPY_HW_L4_512_FS) && MICROPY_HW_L4_512_FS
+#define FLASH_MEM_SEG2_START_ADDR (0x080A0000) // sector 320
+#define FLASH_MEM_SEG2_NUM_BLOCKS (768) // 384 kBytes
+#endif
 
 #else
 #error "no storage support for this MCU"

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,8 @@ MEMORY`
`10`	`10`	`FLASH_FS (r) : ORIGIN = 0x08000800, LENGTH = 0x001F800 /* sectors 1-63 (2K each = 126 KiB) */`
`11`	`11`	`FLASH_TEXT (rx) : ORIGIN = 0x08020000, LENGTH = 0x0060000 /* Sector starting @ 64 */`
`12`	`12`	`RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 96K`
`13`		`- SRAM2 (xrw) : ORIGIN = 0x10000000, LENGTH = 32K`
	`13`	`+ SRAM2_FS_BUF (xrw) : ORIGIN = 0x10000000, LENGTH = 0x0000800 /* 2K, do not touch used directly by storage.c */`
	`14`	`+ SRAM2 (xrw) : ORIGIN = 0x10000800, LENGTH = 0x0007800 /* 30K */`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`ENTRY(Reset_Handler)`