diff options
| author | ZYH <[email protected]> | 2018-03-16 10:58:40 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-03-16 10:58:40 +0800 |
| commit | c556e9acc1462e733bf19e84f4aa314bf1bf5d1a (patch) | |
| tree | 3e87133fbd940e5db506616c7f58260a5fad0749 | |
| parent | 9ad0cb214dfec89c45a95264968fde40b69b190f (diff) | |
| parent | 2b1fc7c4c4f69b0f46456d43d721118b20922d46 (diff) | |
Merge pull request #1286 from ChunfengMu/fix_bugs
[bsp][stm32f10x]enable RT_USING_COMPONENTS_INIT and fix SConscript fo…
| -rw-r--r-- | bsp/stm32f10x/.config | 5 | ||||
| -rw-r--r-- | bsp/stm32f10x/drivers/SConscript | 2 | ||||
| -rw-r--r-- | bsp/stm32f10x/rtconfig.h | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/bsp/stm32f10x/.config b/bsp/stm32f10x/.config index c8e303cc90..360fa61320 100644 --- a/bsp/stm32f10x/.config +++ b/bsp/stm32f10x/.config @@ -58,7 +58,8 @@ CONFIG_ARCH_ARM_CORTEX_M3=y # # 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 @@ -261,12 +262,12 @@ CONFIG_RT_USING_RTT_CMSIS=y # CONFIG_PKG_USING_FASTLZ is not set # CONFIG_PKG_USING_MINILZO is not set # CONFIG_PKG_USING_QUICKLZ is not set +# CONFIG_PKG_USING_MULTIBUTTON is not set # # example package: hello # # CONFIG_PKG_USING_HELLO is not set -# CONFIG_PKG_USING_MULTIBUTTON is not set CONFIG_SOC_STM32F1=y CONFIG_RT_USING_UART1=y CONFIG_RT_USING_UART2=y diff --git a/bsp/stm32f10x/drivers/SConscript b/bsp/stm32f10x/drivers/SConscript index c8609944d5..8e40f0c280 100644 --- a/bsp/stm32f10x/drivers/SConscript +++ b/bsp/stm32f10x/drivers/SConscript @@ -29,7 +29,7 @@ if GetDepend('RT_USING_DFS'): # add Ethernet drivers. if GetDepend('RT_USING_RTC'): - src += ['rtc.c'] + src += ['stm32f1_rtc.c'] # add Ethernet drivers. if GetDepend('PKG_USING_GUIENGINE'): diff --git a/bsp/stm32f10x/rtconfig.h b/bsp/stm32f10x/rtconfig.h index e91f4bef32..e41cb5fc10 100644 --- a/bsp/stm32f10x/rtconfig.h +++ b/bsp/stm32f10x/rtconfig.h @@ -54,7 +54,8 @@ /* RT-Thread Components */ -/* RT_USING_COMPONENTS_INIT is not set */ +#define RT_USING_COMPONENTS_INIT +/* RT_USING_USER_MAIN is not set */ /* C++ features */ @@ -228,11 +229,11 @@ /* PKG_USING_FASTLZ is not set */ /* PKG_USING_MINILZO is not set */ /* PKG_USING_QUICKLZ is not set */ +/* PKG_USING_MULTIBUTTON is not set */ /* example package: hello */ /* PKG_USING_HELLO is not set */ -/* PKG_USING_MULTIBUTTON is not set */ #define SOC_STM32F1 #define RT_USING_UART1 #define RT_USING_UART2 |