sai kiran
Watchdog Timer
Fork of
mbed-src
by 
mbed official
Revision 630:1806c2edb763, committed 2015-09-28
- Comitter:
- mbed_official
- Date:
- Mon Sep 28 10:30:09 2015 +0100
- Parent:
- 629:d925a6dbb7c8
- Child:
- 631:825f75ca301e
- Commit message:
- Synchronized with git revision 87e468c302cd3e5d0f840971ca587ba8c50847bf
Full URL: https://github.com/mbedmicro/mbed/commit/87e468c302cd3e5d0f840971ca587ba8c50847bf/
Fixed stack location problem for disco and nucleo boards (STM32L4)
Changed in this revision
--- a/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L476VG/TOOLCHAIN_ARM_MICRO/startup_stm32l476xx.s Mon Sep 28 06:30:09 2015 +0100
+++ b/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L476VG/TOOLCHAIN_ARM_MICRO/startup_stm32l476xx.s Mon Sep 28 10:30:09 2015 +0100
@@ -52,8 +52,7 @@
Stack_Mem SPACE Stack_Size
-;FAIL __initial_sp EQU 0x20020000 ; Top of RAM
-__initial_sp
+__initial_sp EQU 0x10008000 ; Top of RAM, L4-ECC-SRAM2 retained in standby
; <h> Heap Configuration
; <o> Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
--- a/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L476VG/TOOLCHAIN_ARM_MICRO/stm32l476xx.sct Mon Sep 28 06:30:09 2015 +0100
+++ b/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L476VG/TOOLCHAIN_ARM_MICRO/stm32l476xx.sct Mon Sep 28 10:30:09 2015 +0100
@@ -37,11 +37,11 @@
}
; Total: 98 vectors = 392 bytes (0x188) to be reserved in RAM
- RW_IRAM1 (0x20000000+0x188) (0x20000-0x188) { ; RW data
+ RW_IRAM1 (0x10000000+0x188) (0x08000-0x188) { ; RW data 32k L4-ECC-SRAM2 retained in standby
.ANY (+RW +ZI)
}
- RW_IRAM2 0x10000000 0x00008000 {
+ RW_IRAM2 0x20000000 0x00018000 { ; RW data 96k L4-SRAM1
.ANY (+RW +ZI)
}
--- a/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L476VG/TOOLCHAIN_ARM_STD/startup_stm32l476xx.s Mon Sep 28 06:30:09 2015 +0100
+++ b/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L476VG/TOOLCHAIN_ARM_STD/startup_stm32l476xx.s Mon Sep 28 10:30:09 2015 +0100
@@ -39,7 +39,7 @@
;
;*******************************************************************************
-__initial_sp EQU 0x20020000 ; Top of RAM
+__initial_sp EQU 0x10008000 ; Top of RAM, L4-ECC-SRAM2 retained in standby
PRESERVE8
THUMB
--- a/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L476VG/TOOLCHAIN_ARM_STD/stm32l476xx.sct Mon Sep 28 06:30:09 2015 +0100
+++ b/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L476VG/TOOLCHAIN_ARM_STD/stm32l476xx.sct Mon Sep 28 10:30:09 2015 +0100
@@ -37,11 +37,11 @@
}
; Total: 98 vectors = 392 bytes (0x188) to be reserved in RAM
- RW_IRAM1 (0x20000000+0x188) (0x20000-0x188) { ; RW data
+ RW_IRAM1 (0x10000000+0x188) (0x08000-0x188) { ; RW data 32k L4-ECC-SRAM2 retained in standby
.ANY (+RW +ZI)
}
- RW_IRAM2 0x10000000 0x00008000 {
+ RW_IRAM2 0x20000000 0x00018000 { ; RW data 96k L4-SRAM1
.ANY (+RW +ZI)
}
--- a/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L476VG/TOOLCHAIN_GCC_ARM/STM32L476XX.ld Mon Sep 28 06:30:09 2015 +0100
+++ b/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L476VG/TOOLCHAIN_GCC_ARM/STM32L476XX.ld Mon Sep 28 10:30:09 2015 +0100
@@ -2,7 +2,8 @@
MEMORY
{
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 1024K
- RAM (rwx) : ORIGIN = 0x20000188, LENGTH = 128K - 0x188
+ SRAM2 (rwx) : ORIGIN = 0x10000188, LENGTH = 32k - 0x188
+ SRAM1 (rwx) : ORIGIN = 0x20000000, LENGTH = 96k
}
/* Linker script to place sections and symbol values. Should be used together
@@ -111,7 +112,7 @@
__data_end__ = .;
_edata = .;
- } > RAM
+ } > SRAM2
.bss :
{
@@ -123,7 +124,7 @@
. = ALIGN(4);
__bss_end__ = .;
_ebss = .;
- } > RAM
+ } > SRAM2
.heap (COPY):
{
@@ -131,7 +132,7 @@
end = __end__;
*(.heap*)
__HeapLimit = .;
- } > RAM
+ } > SRAM2
/* .stack_dummy section doesn't contains any symbols. It is only
* used for linker to calculate size of stack sections, and assign
@@ -139,11 +140,11 @@
.stack_dummy (COPY):
{
*(.stack*)
- } > RAM
+ } > SRAM2
/* Set stack top to end of RAM, and stack limit move down by
* size of stack_dummy section */
- __StackTop = ORIGIN(RAM) + LENGTH(RAM);
+ __StackTop = ORIGIN(SRAM2) + LENGTH(SRAM2);
_estack = __StackTop;
__StackLimit = __StackTop - SIZEOF(.stack_dummy);
PROVIDE(__stack = __StackTop);
--- a/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L476VG/TOOLCHAIN_IAR/stm32l476xx.icf Mon Sep 28 06:30:09 2015 +0100
+++ b/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L476VG/TOOLCHAIN_IAR/stm32l476xx.icf Mon Sep 28 10:30:09 2015 +0100
@@ -3,20 +3,20 @@
define symbol __region_ROM_start__ = 0x08000000;
define symbol __region_ROM_end__ = 0x080FFFFF;
-/* [RAM = 128kb = 0x20000] */
+/* [RAM = 96kb + 32kb = 0x20000] */
/* Vector table dynamic copy: Total: 98 vectors = 392 bytes (0x188) to be reserved in RAM */
-define symbol __NVIC_start__ = 0x20000000;
-define symbol __NVIC_end__ = 0x20000187; /* Aligned on 8 bytes (392 = 49 x 8) */
-define symbol __region_RAM_start__ = 0x20000188;
-define symbol __region_RAM_end__ = 0x2001FFFF;
-define symbol __region_SRAM2_start__ = 0x10000000;
+define symbol __NVIC_start__ = 0x10000000;
+define symbol __NVIC_end__ = 0x10000187; /* Aligned on 8 bytes (392 = 49 x 8) */
+define symbol __region_SRAM2_start__ = 0x10000188;
define symbol __region_SRAM2_end__ = 0x10007FFF;
+define symbol __region_SRAM1_start__ = 0x20000000;
+define symbol __region_SRAM1_end__ = 0x20017FFF;
/* Memory regions */
define memory mem with size = 4G;
define region ROM_region = mem:[from __region_ROM_start__ to __region_ROM_end__];
-define region RAM_region = mem:[from __region_RAM_start__ to __region_RAM_end__];
define region SRAM2_region = mem:[from __region_SRAM2_start__ to __region_SRAM2_end__];
+define region SRAM1_region = mem:[from __region_SRAM1_start__ to __region_SRAM1_end__];
/* Stack 1/8 and Heap 1/4 of RAM */
define symbol __size_cstack__ = 0x4000;
@@ -31,5 +31,5 @@
place at address mem:__intvec_start__ { readonly section .intvec };
place in ROM_region { readonly };
-place in RAM_region { readwrite, block STACKHEAP };
-place in SRAM2_region { };
\ No newline at end of file
+place in SRAM2_region { readwrite, block STACKHEAP };
+place in SRAM1_region { };
--- a/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_NUCLEO_L476RG/TOOLCHAIN_ARM_MICRO/startup_stm32l476xx.s Mon Sep 28 06:30:09 2015 +0100
+++ b/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_NUCLEO_L476RG/TOOLCHAIN_ARM_MICRO/startup_stm32l476xx.s Mon Sep 28 10:30:09 2015 +0100
@@ -52,8 +52,7 @@
Stack_Mem SPACE Stack_Size
-;FAIL __initial_sp EQU 0x20020000 ; Top of RAM
-__initial_sp
+__initial_sp EQU 0x10008000 ; Top of RAM, L4-ECC-SRAM2 retained in standby
; <h> Heap Configuration
; <o> Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
--- a/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_NUCLEO_L476RG/TOOLCHAIN_ARM_MICRO/stm32l476xx.sct Mon Sep 28 06:30:09 2015 +0100
+++ b/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_NUCLEO_L476RG/TOOLCHAIN_ARM_MICRO/stm32l476xx.sct Mon Sep 28 10:30:09 2015 +0100
@@ -37,11 +37,11 @@
}
; Total: 98 vectors = 392 bytes (0x188) to be reserved in RAM
- RW_IRAM1 (0x20000000+0x188) (0x20000-0x188) { ; RW data
+ RW_IRAM1 (0x10000000+0x188) (0x08000-0x188) { ; RW data 32k L4-ECC-SRAM2 retained in standby
.ANY (+RW +ZI)
}
- RW_IRAM2 0x10000000 0x00008000 {
+ RW_IRAM2 0x20000000 0x00018000 { ; RW data 96k L4-SRAM1
.ANY (+RW +ZI)
}
--- a/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_NUCLEO_L476RG/TOOLCHAIN_ARM_STD/startup_stm32l476xx.s Mon Sep 28 06:30:09 2015 +0100
+++ b/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_NUCLEO_L476RG/TOOLCHAIN_ARM_STD/startup_stm32l476xx.s Mon Sep 28 10:30:09 2015 +0100
@@ -39,7 +39,7 @@
;
;*******************************************************************************
-__initial_sp EQU 0x20020000 ; Top of RAM
+__initial_sp EQU 0x10008000 ; Top of RAM, L4-ECC-SRAM2 retained in standby
PRESERVE8
THUMB
--- a/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_NUCLEO_L476RG/TOOLCHAIN_ARM_STD/stm32l476xx.sct Mon Sep 28 06:30:09 2015 +0100
+++ b/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_NUCLEO_L476RG/TOOLCHAIN_ARM_STD/stm32l476xx.sct Mon Sep 28 10:30:09 2015 +0100
@@ -37,11 +37,11 @@
}
; Total: 98 vectors = 392 bytes (0x188) to be reserved in RAM
- RW_IRAM1 (0x20000000+0x188) (0x20000-0x188) { ; RW data
+ RW_IRAM1 (0x10000000+0x188) (0x08000-0x188) { ; RW data 32k L4-ECC-SRAM2 retained in standby
.ANY (+RW +ZI)
}
- RW_IRAM2 0x10000000 0x00008000 {
+ RW_IRAM2 0x20000000 0x00018000 { ; RW data 96k L4-SRAM1
.ANY (+RW +ZI)
}
--- a/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_NUCLEO_L476RG/TOOLCHAIN_GCC_ARM/STM32L476XX.ld Mon Sep 28 06:30:09 2015 +0100
+++ b/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_NUCLEO_L476RG/TOOLCHAIN_GCC_ARM/STM32L476XX.ld Mon Sep 28 10:30:09 2015 +0100
@@ -2,7 +2,8 @@
MEMORY
{
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 1024K
- RAM (rwx) : ORIGIN = 0x20000188, LENGTH = 128K - 0x188
+ SRAM2 (rwx) : ORIGIN = 0x10000188, LENGTH = 32k - 0x188
+ SRAM1 (rwx) : ORIGIN = 0x20000000, LENGTH = 96k
}
/* Linker script to place sections and symbol values. Should be used together
@@ -111,7 +112,7 @@
__data_end__ = .;
_edata = .;
- } > RAM
+ } > SRAM2
.bss :
{
@@ -123,7 +124,7 @@
. = ALIGN(4);
__bss_end__ = .;
_ebss = .;
- } > RAM
+ } > SRAM2
.heap (COPY):
{
@@ -131,7 +132,7 @@
end = __end__;
*(.heap*)
__HeapLimit = .;
- } > RAM
+ } > SRAM2
/* .stack_dummy section doesn't contains any symbols. It is only
* used for linker to calculate size of stack sections, and assign
@@ -139,11 +140,11 @@
.stack_dummy (COPY):
{
*(.stack*)
- } > RAM
+ } > SRAM2
/* Set stack top to end of RAM, and stack limit move down by
* size of stack_dummy section */
- __StackTop = ORIGIN(RAM) + LENGTH(RAM);
+ __StackTop = ORIGIN(SRAM2) + LENGTH(SRAM2);
_estack = __StackTop;
__StackLimit = __StackTop - SIZEOF(.stack_dummy);
PROVIDE(__stack = __StackTop);
--- a/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_NUCLEO_L476RG/TOOLCHAIN_IAR/stm32l476xx.icf Mon Sep 28 06:30:09 2015 +0100
+++ b/targets/cmsis/TARGET_STM/TARGET_STM32L4/TARGET_NUCLEO_L476RG/TOOLCHAIN_IAR/stm32l476xx.icf Mon Sep 28 10:30:09 2015 +0100
@@ -3,20 +3,20 @@
define symbol __region_ROM_start__ = 0x08000000;
define symbol __region_ROM_end__ = 0x080FFFFF;
-/* [RAM = 128kb = 0x20000] */
+/* [RAM = 96kb + 32kb = 0x20000] */
/* Vector table dynamic copy: Total: 98 vectors = 392 bytes (0x188) to be reserved in RAM */
-define symbol __NVIC_start__ = 0x20000000;
-define symbol __NVIC_end__ = 0x20000187; /* Aligned on 8 bytes (392 = 49 x 8) */
-define symbol __region_RAM_start__ = 0x20000188;
-define symbol __region_RAM_end__ = 0x2001FFFF;
-define symbol __region_SRAM2_start__ = 0x10000000;
+define symbol __NVIC_start__ = 0x10000000;
+define symbol __NVIC_end__ = 0x10000187; /* Aligned on 8 bytes (392 = 49 x 8) */
+define symbol __region_SRAM2_start__ = 0x10000188;
define symbol __region_SRAM2_end__ = 0x10007FFF;
+define symbol __region_SRAM1_start__ = 0x20000000;
+define symbol __region_SRAM1_end__ = 0x20017FFF;
/* Memory regions */
define memory mem with size = 4G;
define region ROM_region = mem:[from __region_ROM_start__ to __region_ROM_end__];
-define region RAM_region = mem:[from __region_RAM_start__ to __region_RAM_end__];
define region SRAM2_region = mem:[from __region_SRAM2_start__ to __region_SRAM2_end__];
+define region SRAM1_region = mem:[from __region_SRAM1_start__ to __region_SRAM1_end__];
/* Stack 1/8 and Heap 1/4 of RAM */
define symbol __size_cstack__ = 0x4000;
@@ -31,5 +31,5 @@
place at address mem:__intvec_start__ { readonly section .intvec };
place in ROM_region { readonly };
-place in RAM_region { readwrite, block STACKHEAP };
-place in SRAM2_region { };
\ No newline at end of file
+place in SRAM2_region { readwrite, block STACKHEAP };
+place in SRAM1_region { };