diff options
| author | Bernard Xiong <[email protected]> | 2019-04-25 10:34:38 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-04-25 10:34:38 +0800 |
| commit | ba99d95d564f4a0a60378cf5b6bad9fc258b1e55 (patch) | |
| tree | 58813c2a7663c57cbfb6baa7588554499b42c183 | |
| parent | 16b67da162996a4e08007483de1a337acb0b3057 (diff) | |
| parent | 02c7158c1a70869cc5e2d11dbfaae41b1979de85 (diff) | |
Merge pull request #2612 from yangjie11/yj_fix_branch
[bsp][stm32]modify stm32l4xx template,preventing conflict with the linker files
| -rw-r--r-- | bsp/stm32/libraries/templates/stm32l4xx/board/board.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/bsp/stm32/libraries/templates/stm32l4xx/board/board.h b/bsp/stm32/libraries/templates/stm32l4xx/board/board.h index 54139616c1..ba568f0f2c 100644 --- a/bsp/stm32/libraries/templates/stm32l4xx/board/board.h +++ b/bsp/stm32/libraries/templates/stm32l4xx/board/board.h @@ -6,6 +6,7 @@ * Change Logs: * Date Author Notes * 2018-11-5 SummerGift first version + * 2019-04-24 yangjie Use the end of ZI as HEAP_BEGIN */ #ifndef __BOARD_H__ @@ -28,7 +29,17 @@ extern "C" { #define STM32_SRAM1_START (0x20000000) #define STM32_SRAM1_END (STM32_SRAM1_START + STM32_SRAM1_SIZE * 1024) -#define HEAP_BEGIN STM32_SRAM1_START +#ifdef __CC_ARM +extern int Image$$RW_IRAM1$$ZI$$Limit; +#define HEAP_BEGIN ((void *)&Image$$RW_IRAM1$$ZI$$Limit) +#elif __ICCARM__ +#pragma section="CSTACK" +#define HEAP_BEGIN (__segment_end("CSTACK")) +#else +extern int __bss_end; +#define HEAP_BEGIN ((void *)&__bss_end) +#endif + #define HEAP_END STM32_SRAM1_END void SystemClock_Config(void); |