From d91083988073ef98d2ea9bb8af0211cdc1559f36 Mon Sep 17 00:00:00 2001
From: yangjie <yangjiexaut@126.com>
Date: Wed, 24 Apr 2019 19:05:14 +0800
Subject: [PATCH] [bsp][stm32]modify stm32l4xx template,preventing conflict
 with the linker files

---
 .../libraries/templates/stm32l4xx/board/board.h     | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

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);
-- 
GitLab