switch to stm32l151cb-a & work around flash size field width.

ithinuel · ithinuel · commit c31676306a10 · 2018-03-26T18:00:18.000+01:00
diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_MTB_RAK811/device/TOOLCHAIN_ARM_MICRO/startup_stm32l151xba.S b/targets/TARGET_STM/TARGET_STM32L1/TARGET_MTB_RAK811/device/TOOLCHAIN_ARM_MICRO/startup_stm32l151xba.S
@@ -54,7 +54,7 @@ Stack_Size      EQU     0x00000400
                 EXPORT  __initial_sp
 
 Stack_Mem       SPACE   Stack_Size
-__initial_sp    EQU     0x20004000 ; Top of RAM (16 KB)
+__initial_sp    EQU     0x20008000 ; Top of RAM (32 KB)
 
 
 ; <h> Heap Configuration
diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_MTB_RAK811/device/TOOLCHAIN_ARM_MICRO/stm32l151cba.sct b/targets/TARGET_STM/TARGET_STM32L1/TARGET_MTB_RAK811/device/TOOLCHAIN_ARM_MICRO/stm32l151cba.sct
@@ -27,7 +27,7 @@
 ; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-; STM32L151CB: 128KB FLASH + 16KB SRAM
+; STM32L151CB: 128KB FLASH + 32KB SRAM
 LR_IROM1 0x08000000 0x20000  {    ; load region size_region
 
   ER_IROM1 0x08000000 0x20000  {  ; load address = execution address
@@ -37,7 +37,7 @@ LR_IROM1 0x08000000 0x20000  {    ; load region size_region
   }
 
   ; 61 vectors = 244 bytes (0xF4) to be reserved in RAM
-  RW_IRAM1 (0x20000000+0xF4) (0x4000-0xF4)  {  ; RW data
+  RW_IRAM1 (0x20000000+0xF4) (0x8000-0xF4)  {  ; RW data
    .ANY (+RW +ZI)
   }
 
diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_MTB_RAK811/device/TOOLCHAIN_ARM_STD/startup_stm32l151xba.S b/targets/TARGET_STM/TARGET_STM32L1/TARGET_MTB_RAK811/device/TOOLCHAIN_ARM_STD/startup_stm32l151xba.S
@@ -48,7 +48,7 @@
 ;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-__initial_sp    EQU     0x20004000 ; Top of RAM (16 KB)
+__initial_sp    EQU     0x20008000 ; Top of RAM (32 KB)
 
                 PRESERVE8
                 THUMB
diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_MTB_RAK811/device/TOOLCHAIN_ARM_STD/stm32l151cba.sct b/targets/TARGET_STM/TARGET_STM32L1/TARGET_MTB_RAK811/device/TOOLCHAIN_ARM_STD/stm32l151cba.sct
@@ -27,7 +27,7 @@
 ; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-; STM32L151CB: 128KB FLASH + 16KB SRAM
+; STM32L151CB: 128KB FLASH + 32KB SRAM
 LR_IROM1 0x08000000 0x20000  {    ; load region size_region
 
   ER_IROM1 0x08000000 0x20000  {  ; load address = execution address
@@ -37,7 +37,7 @@ LR_IROM1 0x08000000 0x20000  {    ; load region size_region
   }
 
   ; 61 vectors = 244 bytes (0xF4) to be reserved in RAM
-  RW_IRAM1 (0x20000000+0xF4) (0x4000-0xF4)  {  ; RW data
+  RW_IRAM1 (0x20000000+0xF4) (0x8000-0xF4)  {  ; RW data
    .ANY (+RW +ZI)
   }
 
diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_MTB_RAK811/device/TOOLCHAIN_GCC_ARM/STM32L151XB-A.ld b/targets/TARGET_STM/TARGET_STM32L1/TARGET_MTB_RAK811/device/TOOLCHAIN_GCC_ARM/STM32L151XB-A.ld
@@ -2,11 +2,11 @@
 
 MEMORY
 {
-  /* 128KB FLASH, 16KB RAM, Reserve up till 0xF4. There are 61 vectors = 244
+  /* 128KB FLASH, 32KB RAM, Reserve up till 0xF4. There are 61 vectors = 244
    * bytes (0xF4) in RAM.
    */
   FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 128k
-  RAM (rwx) : ORIGIN = 0x200000F4, LENGTH = 0x4000-0xF4
+  RAM (rwx) : ORIGIN = 0x200000F4, LENGTH = 0x8000-0xF4
 }
 
 /* Linker script to place sections and symbol values. Should be used together
diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_MTB_RAK811/device/TOOLCHAIN_GCC_ARM/startup_stm32l151xba.S b/targets/TARGET_STM/TARGET_STM32L1/TARGET_MTB_RAK811/device/TOOLCHAIN_GCC_ARM/startup_stm32l151xba.S
diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_MTB_RAK811/device/stm32l151xba.h b/targets/TARGET_STM/TARGET_STM32L1/TARGET_MTB_RAK811/device/stm32l151xba.h
diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_MTB_RAK811/device/stm32l1xx.h b/targets/TARGET_STM/TARGET_STM32L1/TARGET_MTB_RAK811/device/stm32l1xx.h
@@ -95,8 +95,8 @@
   /* #define STM32L100xB  */   /*!< STM32L100C6, STM32L100R and STM32L100RB Devices */
   /* #define STM32L100xBA */   /*!< STM32L100C6-A, STM32L100R8-A and STM32L100RB-A Devices */
   /* #define STM32L100xC  */   /*!< STM32L100RC Devices */
-     #define STM32L151xB       /*!< STM32L151C6, STM32L151R6, STM32L151C8, STM32L151R8, STM32L151V8, STM32L151CB, STM32L151RB and STM32L151VB */
-  /* #define STM32L151xBA */   /*!< STM32L151C6-A, STM32L151R6-A, STM32L151C8-A, STM32L151R8-A, STM32L151V8-A, STM32L151CB-A, STM32L151RB-A and STM32L151VB-A */ 
+  /* #define STM32L151xB  */   /*!< STM32L151C6, STM32L151R6, STM32L151C8, STM32L151R8, STM32L151V8, STM32L151CB, STM32L151RB and STM32L151VB */
+     #define STM32L151xBA      /*!< STM32L151C6-A, STM32L151R6-A, STM32L151C8-A, STM32L151R8-A, STM32L151V8-A, STM32L151CB-A, STM32L151RB-A and STM32L151VB-A */ 
   /* #define STM32L151xC  */   /*!< STM32L151CC, STM32L151UC, STM32L151RC and STM32L151VC */
   /* #define STM32L151xCA */   /*!< STM32L151RC-A, STM32L151VC-A, STM32L151QC and STM32L151ZC */
   /* #define STM32L151xD  */   /*!< STM32L151QD, STM32L151RD, STM32L151VD & STM32L151ZD */
diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_flash.h b/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_flash.h
@@ -139,7 +139,9 @@ typedef struct
   * @{
   */ 
 
+#ifndef FLASH_SIZE
 #define FLASH_SIZE                (uint32_t)(*((uint16_t *)FLASHSIZE_BASE) * 1024U)
+#endif
 #define FLASH_PAGE_SIZE           ((uint32_t)256U)  /*!< FLASH Page Size in bytes */
 
 /**
diff --git a/targets/TARGET_STM/mbed_rtx.h b/targets/TARGET_STM/mbed_rtx.h
@@ -47,8 +47,7 @@
 
 #elif (defined(TARGET_STM32F070RB) ||\
        defined(TARGET_STM32F072RB) ||\
-       defined(TARGET_STM32F302R8) ||\
-       defined(TARGET_STM32L151CB))
+       defined(TARGET_STM32F302R8))
 #define INITIAL_SP              (0x20004000UL)
 
 #elif (defined(TARGET_STM32F103RB) ||\
@@ -60,6 +59,7 @@
 
 #elif (defined(TARGET_STM32F091RC) ||\
        defined(TARGET_STM32F410RB) ||\
+       defined(TARGET_STM32L151CBA)||\
        defined(TARGET_STM32L151CC) ||\
        defined(TARGET_STM32L151RC) ||\
        defined(TARGET_STM32L152RC))
diff --git a/targets/targets.json b/targets/targets.json
@@ -2032,11 +2032,11 @@
         "inherits": ["FAMILY_STM32"],
         "core": "Cortex-M3",
         "default_toolchain": "ARM",
-        "extra_labels_add": ["STM32L1", "STM32L151xB", "STM32L151CB"],
+        "extra_labels_add": ["STM32L1", "STM32L151xBA", "STM32L151CBA"],
         "supported_toolchains": ["ARM", "GCC_ARM"],
-        "device_has_add": ["ANALOGOUT", "FLASH"],
+        "device_has_add": ["ANALOGOUT"],
         "release_versions": ["5"],
-        "device_name": "STM32L151CB",
+        "device_name": "STM32L151CBA",
         "bootloader_supported": true
     },
     "MOTE_L152RC": {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.`
`28`	`28`	`;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;`
`29`	`29`
`30`		`-; STM32L151CB: 128KB FLASH + 16KB SRAM`
	`30`	`+; STM32L151CB: 128KB FLASH + 32KB SRAM`
`31`	`31`	`LR_IROM1 0x08000000 0x20000 { ; load region size_region`
`32`	`32`
`33`	`33`	`ER_IROM1 0x08000000 0x20000 { ; load address = execution address`
`@@ -37,7 +37,7 @@ LR_IROM1 0x08000000 0x20000 { ; load region size_region`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`; 61 vectors = 244 bytes (0xF4) to be reserved in RAM`
`40`		`- RW_IRAM1 (0x20000000+0xF4) (0x4000-0xF4) { ; RW data`
	`40`	`+ RW_IRAM1 (0x20000000+0xF4) (0x8000-0xF4) { ; RW data`
`41`	`41`	`.ANY (+RW +ZI)`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,11 @@`
`2`	`2`
`3`	`3`	`MEMORY`
`4`	`4`	`{`
`5`		`- /* 128KB FLASH, 16KB RAM, Reserve up till 0xF4. There are 61 vectors = 244`
	`5`	`+ /* 128KB FLASH, 32KB RAM, Reserve up till 0xF4. There are 61 vectors = 244`
`6`	`6`	`* bytes (0xF4) in RAM.`
`7`	`7`	`*/`
`8`	`8`	`FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 128k`
`9`		`- RAM (rwx) : ORIGIN = 0x200000F4, LENGTH = 0x4000-0xF4`
	`9`	`+ RAM (rwx) : ORIGIN = 0x200000F4, LENGTH = 0x8000-0xF4`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`/* Linker script to place sections and symbol values. Should be used together`