diff options
| author | Bernard Xiong <[email protected]> | 2019-01-29 04:28:40 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-01-29 04:28:40 +0800 |
| commit | b2c2958964d429775e3da335a4f6ca5b4f9e1671 (patch) | |
| tree | 25a2209ba4814d41b19e624a136ca1c7c894918f /bsp/stm32/stm32f103-fire-arbitrary | |
| parent | dfebb30c91875c52f16fd4e7bb9e5981fd0512b4 (diff) | |
| parent | 8ff9b7795f0423eee36a19b2a36cec4e00c1e831 (diff) | |
Merge pull request #2289 from armink/lts-v3.1.xv3.1.2
Lts v3.1.x
Diffstat (limited to 'bsp/stm32/stm32f103-fire-arbitrary')
5 files changed, 7 insertions, 6 deletions
diff --git a/bsp/stm32/stm32f103-fire-arbitrary/SConstruct b/bsp/stm32/stm32f103-fire-arbitrary/SConstruct index c28354a99d..05326b2b75 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/SConstruct +++ b/bsp/stm32/stm32f103-fire-arbitrary/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/stm32f103-fire-arbitrary/applications/main.c b/bsp/stm32/stm32f103-fire-arbitrary/applications/main.c index 4024c1ae3f..5f0f0db8ed 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/applications/main.c +++ b/bsp/stm32/stm32f103-fire-arbitrary/applications/main.c @@ -5,13 +5,13 @@ * * Change Logs: * Date Author Notes - * 2018-11-5 SummerGift change to new framework + * 2018-11-5 SummerGift first version */ #include <rtthread.h> #include <rtdevice.h> #include <board.h> -#include "drv_gpio.h" + /* defined the LED0 pin: PF7 */ #define LED0_PIN GET_PIN(F, 7) diff --git a/bsp/stm32/stm32f103-fire-arbitrary/board/Kconfig b/bsp/stm32/stm32f103-fire-arbitrary/board/Kconfig index 983ce4bb86..419bb3564c 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/board/Kconfig +++ b/bsp/stm32/stm32f103-fire-arbitrary/board/Kconfig @@ -19,7 +19,7 @@ menu "Onboard Peripheral Drivers" default n config BSP_USING_SPI_FLASH - bool "Enable SPI FLASH (w25q64 spi1)" + bool "Enable SPI FLASH (W25Q64 spi1)" select BSP_USING_SPI select BSP_USING_SPI1 select RT_USING_SFUD diff --git a/bsp/stm32/stm32f103-fire-arbitrary/board/board.c b/bsp/stm32/stm32f103-fire-arbitrary/board/board.c index 9313cffb00..bb2014e419 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/board/board.c +++ b/bsp/stm32/stm32f103-fire-arbitrary/board/board.c @@ -5,7 +5,7 @@ * * Change Logs: * Date Author Notes - * 2018-11-06 balanceTWK change to new framework + * 2018-11-06 balanceTWK first version */ #include <rtthread.h> diff --git a/bsp/stm32/stm32f103-fire-arbitrary/board/board.h b/bsp/stm32/stm32f103-fire-arbitrary/board/board.h index 02ab04f8a0..e99fbbee4b 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/board/board.h +++ b/bsp/stm32/stm32f103-fire-arbitrary/board/board.h @@ -5,7 +5,7 @@ * * Change Logs: * Date Author Notes - * 2018-11-06 balanceTWK change to new framework + * 2018-11-06 balanceTWK 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" { |