summaryrefslogtreecommitdiff
path: root/bsp/stm32/libraries/templates
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2019-01-29 04:28:40 +0800
committerGitHub <[email protected]>2019-01-29 04:28:40 +0800
commitb2c2958964d429775e3da335a4f6ca5b4f9e1671 (patch)
tree25a2209ba4814d41b19e624a136ca1c7c894918f /bsp/stm32/libraries/templates
parentdfebb30c91875c52f16fd4e7bb9e5981fd0512b4 (diff)
parent8ff9b7795f0423eee36a19b2a36cec4e00c1e831 (diff)
Merge pull request #2289 from armink/lts-v3.1.xv3.1.2
Lts v3.1.x
Diffstat (limited to 'bsp/stm32/libraries/templates')
-rw-r--r--bsp/stm32/libraries/templates/stm32f0xx/SConstruct2
-rw-r--r--bsp/stm32/libraries/templates/stm32f0xx/applications/main.c2
-rw-r--r--bsp/stm32/libraries/templates/stm32f0xx/board/board.h3
-rw-r--r--bsp/stm32/libraries/templates/stm32f10x/SConstruct2
-rw-r--r--bsp/stm32/libraries/templates/stm32f10x/applications/main.c4
-rw-r--r--bsp/stm32/libraries/templates/stm32f10x/board/board.c2
-rw-r--r--bsp/stm32/libraries/templates/stm32f10x/board/board.h3
-rw-r--r--bsp/stm32/libraries/templates/stm32f4xx/SConstruct2
-rw-r--r--bsp/stm32/libraries/templates/stm32f4xx/applications/main.c4
-rw-r--r--bsp/stm32/libraries/templates/stm32f4xx/board/board.c2
-rw-r--r--bsp/stm32/libraries/templates/stm32f4xx/board/board.h3
-rw-r--r--bsp/stm32/libraries/templates/stm32f7xx/SConstruct2
-rw-r--r--bsp/stm32/libraries/templates/stm32f7xx/applications/main.c2
-rw-r--r--bsp/stm32/libraries/templates/stm32f7xx/board/board.c2
-rw-r--r--bsp/stm32/libraries/templates/stm32f7xx/board/board.h3
-rw-r--r--bsp/stm32/libraries/templates/stm32l4xx/SConstruct2
-rw-r--r--bsp/stm32/libraries/templates/stm32l4xx/applications/main.c4
-rw-r--r--bsp/stm32/libraries/templates/stm32l4xx/board/board.c2
-rw-r--r--bsp/stm32/libraries/templates/stm32l4xx/board/board.h3
19 files changed, 27 insertions, 22 deletions
diff --git a/bsp/stm32/libraries/templates/stm32f0xx/SConstruct b/bsp/stm32/libraries/templates/stm32f0xx/SConstruct
index 1676e02b25..c120f925df 100644
--- a/bsp/stm32/libraries/templates/stm32f0xx/SConstruct
+++ b/bsp/stm32/libraries/templates/stm32f0xx/SConstruct
@@ -27,7 +27,7 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
if rtconfig.PLATFORM == 'iar':
env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
env.Replace(ARFLAGS = [''])
- env.Replace(LINKCOM = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map rt-thread.map'])
+ env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map')
Export('RTT_ROOT')
Export('rtconfig')
diff --git a/bsp/stm32/libraries/templates/stm32f0xx/applications/main.c b/bsp/stm32/libraries/templates/stm32f0xx/applications/main.c
index 5054699c0d..68a938bbeb 100644
--- a/bsp/stm32/libraries/templates/stm32f0xx/applications/main.c
+++ b/bsp/stm32/libraries/templates/stm32f0xx/applications/main.c
@@ -11,7 +11,7 @@
#include <rtthread.h>
#include <rtdevice.h>
#include <board.h>
-#include "drv_gpio.h"
+
/* defined the LED0 pin: PB1 */
#define LED0_PIN GET_PIN(B, 1)
diff --git a/bsp/stm32/libraries/templates/stm32f0xx/board/board.h b/bsp/stm32/libraries/templates/stm32f0xx/board/board.h
index 58ece4a7c5..3be9e75cfc 100644
--- a/bsp/stm32/libraries/templates/stm32f0xx/board/board.h
+++ b/bsp/stm32/libraries/templates/stm32f0xx/board/board.h
@@ -5,7 +5,7 @@
*
* Change Logs:
* Date Author Notes
- * 2018-11-5 SummerGift change to new framework
+ * 2018-11-5 SummerGift first version
*/
#ifndef __BOARD_H__
@@ -14,6 +14,7 @@
#include <rtthread.h>
#include <stm32f0xx.h>
#include "drv_common.h"
+#include "drv_gpio.h"
#ifdef __cplusplus
extern "C" {
diff --git a/bsp/stm32/libraries/templates/stm32f10x/SConstruct b/bsp/stm32/libraries/templates/stm32f10x/SConstruct
index c28354a99d..05326b2b75 100644
--- a/bsp/stm32/libraries/templates/stm32f10x/SConstruct
+++ b/bsp/stm32/libraries/templates/stm32f10x/SConstruct
@@ -27,7 +27,7 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
if rtconfig.PLATFORM == 'iar':
env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
env.Replace(ARFLAGS = [''])
- env.Replace(LINKCOM = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map rt-thread.map'])
+ env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map')
Export('RTT_ROOT')
Export('rtconfig')
diff --git a/bsp/stm32/libraries/templates/stm32f10x/applications/main.c b/bsp/stm32/libraries/templates/stm32f10x/applications/main.c
index 7c40c1518d..487ddf44f6 100644
--- a/bsp/stm32/libraries/templates/stm32f10x/applications/main.c
+++ b/bsp/stm32/libraries/templates/stm32f10x/applications/main.c
@@ -5,13 +5,13 @@
*
* Change Logs:
* Date Author Notes
- * 2018-11-06 SummerGift change to new framework
+ * 2018-11-06 SummerGift first version
*/
#include <rtthread.h>
#include <rtdevice.h>
#include <board.h>
-#include "drv_gpio.h"
+
/* defined the LED0 pin: PB1 */
#define LED0_PIN GET_PIN(B, 1)
diff --git a/bsp/stm32/libraries/templates/stm32f10x/board/board.c b/bsp/stm32/libraries/templates/stm32f10x/board/board.c
index 33588783ec..9f1ba0ddab 100644
--- a/bsp/stm32/libraries/templates/stm32f10x/board/board.c
+++ b/bsp/stm32/libraries/templates/stm32f10x/board/board.c
@@ -5,7 +5,7 @@
*
* Change Logs:
* Date Author Notes
- * 2018-11-06 SummerGift change to new framework
+ * 2018-11-06 SummerGift first version
*/
#include "board.h"
diff --git a/bsp/stm32/libraries/templates/stm32f10x/board/board.h b/bsp/stm32/libraries/templates/stm32f10x/board/board.h
index 3613a683fc..a01a233cc2 100644
--- a/bsp/stm32/libraries/templates/stm32f10x/board/board.h
+++ b/bsp/stm32/libraries/templates/stm32f10x/board/board.h
@@ -5,7 +5,7 @@
*
* Change Logs:
* Date Author Notes
- * 2018-11-5 SummerGift change to new framework
+ * 2018-11-5 SummerGift first version
*/
#ifndef __BOARD_H__
@@ -14,6 +14,7 @@
#include <rtthread.h>
#include <stm32f1xx.h>
#include "drv_common.h"
+#include "drv_gpio.h"
#ifdef __cplusplus
extern "C" {
diff --git a/bsp/stm32/libraries/templates/stm32f4xx/SConstruct b/bsp/stm32/libraries/templates/stm32f4xx/SConstruct
index c1609bf526..1101c708bd 100644
--- a/bsp/stm32/libraries/templates/stm32f4xx/SConstruct
+++ b/bsp/stm32/libraries/templates/stm32f4xx/SConstruct
@@ -27,7 +27,7 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
if rtconfig.PLATFORM == 'iar':
env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
env.Replace(ARFLAGS = [''])
- env.Replace(LINKCOM = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map rt-thread.map'])
+ env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map')
Export('RTT_ROOT')
Export('rtconfig')
diff --git a/bsp/stm32/libraries/templates/stm32f4xx/applications/main.c b/bsp/stm32/libraries/templates/stm32f4xx/applications/main.c
index 7c40c1518d..487ddf44f6 100644
--- a/bsp/stm32/libraries/templates/stm32f4xx/applications/main.c
+++ b/bsp/stm32/libraries/templates/stm32f4xx/applications/main.c
@@ -5,13 +5,13 @@
*
* Change Logs:
* Date Author Notes
- * 2018-11-06 SummerGift change to new framework
+ * 2018-11-06 SummerGift first version
*/
#include <rtthread.h>
#include <rtdevice.h>
#include <board.h>
-#include "drv_gpio.h"
+
/* defined the LED0 pin: PB1 */
#define LED0_PIN GET_PIN(B, 1)
diff --git a/bsp/stm32/libraries/templates/stm32f4xx/board/board.c b/bsp/stm32/libraries/templates/stm32f4xx/board/board.c
index 9adbd0f32b..ef1f24cbb5 100644
--- a/bsp/stm32/libraries/templates/stm32f4xx/board/board.c
+++ b/bsp/stm32/libraries/templates/stm32f4xx/board/board.c
@@ -5,7 +5,7 @@
*
* Change Logs:
* Date Author Notes
- * 2018-11-06 SummerGift change to new framework
+ * 2018-11-06 SummerGift first version
*/
#include "board.h"
diff --git a/bsp/stm32/libraries/templates/stm32f4xx/board/board.h b/bsp/stm32/libraries/templates/stm32f4xx/board/board.h
index 77a3f20d0d..514155b823 100644
--- a/bsp/stm32/libraries/templates/stm32f4xx/board/board.h
+++ b/bsp/stm32/libraries/templates/stm32f4xx/board/board.h
@@ -5,7 +5,7 @@
*
* Change Logs:
* Date Author Notes
- * 2018-11-5 SummerGift change to new framework
+ * 2018-11-5 SummerGift first version
*/
#ifndef __BOARD_H__
@@ -14,6 +14,7 @@
#include <rtthread.h>
#include <stm32f4xx.h>
#include "drv_common.h"
+#include "drv_gpio.h"
#ifdef __cplusplus
extern "C" {
diff --git a/bsp/stm32/libraries/templates/stm32f7xx/SConstruct b/bsp/stm32/libraries/templates/stm32f7xx/SConstruct
index 51333e0a9c..b6053d64c2 100644
--- a/bsp/stm32/libraries/templates/stm32f7xx/SConstruct
+++ b/bsp/stm32/libraries/templates/stm32f7xx/SConstruct
@@ -27,7 +27,7 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
if rtconfig.PLATFORM == 'iar':
env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
env.Replace(ARFLAGS = [''])
- env.Replace(LINKCOM = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map rt-thread.map'])
+ env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map')
Export('RTT_ROOT')
Export('rtconfig')
diff --git a/bsp/stm32/libraries/templates/stm32f7xx/applications/main.c b/bsp/stm32/libraries/templates/stm32f7xx/applications/main.c
index 87a07a6246..5a4bbf9f42 100644
--- a/bsp/stm32/libraries/templates/stm32f7xx/applications/main.c
+++ b/bsp/stm32/libraries/templates/stm32f7xx/applications/main.c
@@ -5,7 +5,7 @@
*
* Change Logs:
* Date Author Notes
- * 2018-11-06 SummerGift change to new framework
+ * 2018-11-06 SummerGift first version
*/
#include <rtthread.h>
diff --git a/bsp/stm32/libraries/templates/stm32f7xx/board/board.c b/bsp/stm32/libraries/templates/stm32f7xx/board/board.c
index 3b25738661..4194e6db1e 100644
--- a/bsp/stm32/libraries/templates/stm32f7xx/board/board.c
+++ b/bsp/stm32/libraries/templates/stm32f7xx/board/board.c
@@ -5,7 +5,7 @@
*
* Change Logs:
* Date Author Notes
- * 2018-11-06 SummerGift change to new framework
+ * 2018-11-06 SummerGift first version
*/
#include "board.h"
diff --git a/bsp/stm32/libraries/templates/stm32f7xx/board/board.h b/bsp/stm32/libraries/templates/stm32f7xx/board/board.h
index e9c0608423..2951235675 100644
--- a/bsp/stm32/libraries/templates/stm32f7xx/board/board.h
+++ b/bsp/stm32/libraries/templates/stm32f7xx/board/board.h
@@ -5,7 +5,7 @@
*
* Change Logs:
* Date Author Notes
- * 2018-11-5 SummerGift change to new framework
+ * 2018-11-5 SummerGift first version
*/
#ifndef __BOARD_H__
@@ -14,6 +14,7 @@
#include <rtthread.h>
#include <stm32f7xx.h>
#include "drv_common.h"
+#include "drv_gpio.h"
#ifdef __cplusplus
extern "C" {
diff --git a/bsp/stm32/libraries/templates/stm32l4xx/SConstruct b/bsp/stm32/libraries/templates/stm32l4xx/SConstruct
index f28e552248..e1989a9d81 100644
--- a/bsp/stm32/libraries/templates/stm32l4xx/SConstruct
+++ b/bsp/stm32/libraries/templates/stm32l4xx/SConstruct
@@ -27,7 +27,7 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
if rtconfig.PLATFORM == 'iar':
env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
env.Replace(ARFLAGS = [''])
- env.Replace(LINKCOM = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map rt-thread.map'])
+ env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map')
Export('RTT_ROOT')
Export('rtconfig')
diff --git a/bsp/stm32/libraries/templates/stm32l4xx/applications/main.c b/bsp/stm32/libraries/templates/stm32l4xx/applications/main.c
index 7c40c1518d..487ddf44f6 100644
--- a/bsp/stm32/libraries/templates/stm32l4xx/applications/main.c
+++ b/bsp/stm32/libraries/templates/stm32l4xx/applications/main.c
@@ -5,13 +5,13 @@
*
* Change Logs:
* Date Author Notes
- * 2018-11-06 SummerGift change to new framework
+ * 2018-11-06 SummerGift first version
*/
#include <rtthread.h>
#include <rtdevice.h>
#include <board.h>
-#include "drv_gpio.h"
+
/* defined the LED0 pin: PB1 */
#define LED0_PIN GET_PIN(B, 1)
diff --git a/bsp/stm32/libraries/templates/stm32l4xx/board/board.c b/bsp/stm32/libraries/templates/stm32l4xx/board/board.c
index a64660e552..7797c23379 100644
--- a/bsp/stm32/libraries/templates/stm32l4xx/board/board.c
+++ b/bsp/stm32/libraries/templates/stm32l4xx/board/board.c
@@ -5,7 +5,7 @@
*
* Change Logs:
* Date Author Notes
- * 2018-11-06 SummerGift change to new framework
+ * 2018-11-06 SummerGift first version
*/
#include "board.h"
diff --git a/bsp/stm32/libraries/templates/stm32l4xx/board/board.h b/bsp/stm32/libraries/templates/stm32l4xx/board/board.h
index e90a5ecb73..54139616c1 100644
--- a/bsp/stm32/libraries/templates/stm32l4xx/board/board.h
+++ b/bsp/stm32/libraries/templates/stm32l4xx/board/board.h
@@ -5,7 +5,7 @@
*
* Change Logs:
* Date Author Notes
- * 2018-11-5 SummerGift change to new framework
+ * 2018-11-5 SummerGift first version
*/
#ifndef __BOARD_H__
@@ -14,6 +14,7 @@
#include <rtthread.h>
#include <stm32l4xx.h>
#include "drv_common.h"
+#include "drv_gpio.h"
#ifdef __cplusplus
extern "C" {
generated by cgit v1.3.1 (git 2.54.0) at 2026-10-25 21:48:02 +0000