Browse Source

[bsp][stm32f10x]enable RT_USING_COMPONENTS_INIT and fix SConscript for rtc

ChunfengMu 7 years ago
parent
commit
2b1fc7c4c4
3 changed files with 7 additions and 5 deletions
  1. 3 2
      bsp/stm32f10x/.config
  2. 1 1
      bsp/stm32f10x/drivers/SConscript
  3. 3 2
      bsp/stm32f10x/rtconfig.h

+ 3 - 2
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

+ 1 - 1
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'):

+ 3 - 2
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