libs/rt-thread
libs/rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1286 from ChunfengMu/fix_bugs

Browse Source 
[bsp][stm32f10x]enable RT_USING_COMPONENTS_INIT and fix SConscript fo…
This commit is contained in:
ZYH 2018-03-16 10:58:40 +08:00 committed by GitHub
commit c556e9acc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bsp/stm32f10x/.config
View File

@ -58,7 +58,8 @@ CONFIG_ARCH_ARM_CORTEX_M3=y
# #
# RT-Thread Components # RT-Thread Components
# #
# CONFIG_RT_USING_COMPONENTS_INIT is not set CONFIG_RT_USING_COMPONENTS_INIT=y
# CONFIG_RT_USING_USER_MAIN is not set
# #
# C++ features # C++ features
@ -261,12 +262,12 @@ CONFIG_RT_USING_RTT_CMSIS=y
# CONFIG_PKG_USING_FASTLZ is not set # CONFIG_PKG_USING_FASTLZ is not set
# CONFIG_PKG_USING_MINILZO is not set # CONFIG_PKG_USING_MINILZO is not set
# CONFIG_PKG_USING_QUICKLZ is not set # CONFIG_PKG_USING_QUICKLZ is not set
# CONFIG_PKG_USING_MULTIBUTTON is not set
# #
# example package: hello # example package: hello
# #
# CONFIG_PKG_USING_HELLO is not set # CONFIG_PKG_USING_HELLO is not set
# CONFIG_PKG_USING_MULTIBUTTON is not set
CONFIG_SOC_STM32F1=y CONFIG_SOC_STM32F1=y
CONFIG_RT_USING_UART1=y CONFIG_RT_USING_UART1=y
CONFIG_RT_USING_UART2=y CONFIG_RT_USING_UART2=y

2
bsp/stm32f10x/drivers/SConscript
View File

@ -29,7 +29,7 @@ if GetDepend('RT_USING_DFS'):
# add Ethernet drivers. # add Ethernet drivers.
if GetDepend('RT_USING_RTC'): if GetDepend('RT_USING_RTC'):
src += ['rtc.c'] src += ['stm32f1_rtc.c']
# add Ethernet drivers. # add Ethernet drivers.
if GetDepend('PKG_USING_GUIENGINE'): if GetDepend('PKG_USING_GUIENGINE'):

5
bsp/stm32f10x/rtconfig.h
View File

@ -54,7 +54,8 @@
/* RT-Thread Components */ /* RT-Thread Components */
/* RT_USING_COMPONENTS_INIT is not set */ #define RT_USING_COMPONENTS_INIT
/* RT_USING_USER_MAIN is not set */
/* C++ features */ /* C++ features */
@ -228,11 +229,11 @@
/* PKG_USING_FASTLZ is not set */ /* PKG_USING_FASTLZ is not set */
/* PKG_USING_MINILZO is not set */ /* PKG_USING_MINILZO is not set */
/* PKG_USING_QUICKLZ is not set */ /* PKG_USING_QUICKLZ is not set */
/* PKG_USING_MULTIBUTTON is not set */
/* example package: hello */ /* example package: hello */
/* PKG_USING_HELLO is not set */ /* PKG_USING_HELLO is not set */
/* PKG_USING_MULTIBUTTON is not set */
#define SOC_STM32F1 #define SOC_STM32F1
#define RT_USING_UART1 #define RT_USING_UART1
#define RT_USING_UART2 #define RT_USING_UART2