diff options
| author | gbcwbz <[email protected]> | 2016-04-03 21:39:33 +0800 |
|---|---|---|
| committer | gbcwbz <[email protected]> | 2016-04-03 21:39:33 +0800 |
| commit | e35ad3e67779c83ad8654b15d20541a0fdc6bf2a (patch) | |
| tree | a94c479ad3674c4de039cdd56c66b537126e6635 /bsp | |
| parent | 2a9f80d9474d7f760d51710a3262e60dc954c03e (diff) | |
fix initialization error in bsp/stm32f10x
temporarily disable canapp initialization.
Diffstat (limited to 'bsp')
| -rw-r--r-- | bsp/stm32f10x/applications/SConscript | 12 | ||||
| -rw-r--r-- | bsp/stm32f10x/drivers/SConscript | 4 | ||||
| -rw-r--r-- | bsp/stm32f10x/drivers/bxcan.c | 2 | ||||
| -rw-r--r-- | bsp/stm32f10x/rtconfig.h | 2 |
4 files changed, 16 insertions, 4 deletions
diff --git a/bsp/stm32f10x/applications/SConscript b/bsp/stm32f10x/applications/SConscript index 01eb940dfb..4289435f37 100644 --- a/bsp/stm32f10x/applications/SConscript +++ b/bsp/stm32f10x/applications/SConscript @@ -2,8 +2,16 @@ Import('RTT_ROOT') Import('rtconfig') from building import * -cwd = os.path.join(str(Dir('#')), 'applications') -src = Glob('*.c') +cwd = os.path.join(str(Dir('#')), 'applications') + +src = Split(""" +application.c +startup.c +""") + +if GetDepend('RT_USING_CAN'): + src += ['canapp.c'] + CPPPATH = [cwd, str(Dir('#'))] group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH) diff --git a/bsp/stm32f10x/drivers/SConscript b/bsp/stm32f10x/drivers/SConscript index 30a848fc40..6be188e0f0 100644 --- a/bsp/stm32f10x/drivers/SConscript +++ b/bsp/stm32f10x/drivers/SConscript @@ -12,6 +12,10 @@ led.c usart.c """) +# add canbus driver. +if GetDepend('RT_USING_CAN'): + src += ['bxcan.c'] + # add Ethernet drivers. if GetDepend('RT_USING_LWIP'): src += ['dm9000a.c'] diff --git a/bsp/stm32f10x/drivers/bxcan.c b/bsp/stm32f10x/drivers/bxcan.c index e19d971123..071d05e8cc 100644 --- a/bsp/stm32f10x/drivers/bxcan.c +++ b/bsp/stm32f10x/drivers/bxcan.c @@ -1575,4 +1575,4 @@ int stm32_bxcan_init(void) } INIT_BOARD_EXPORT(stm32_bxcan_init); -#endif /*RT_USING_CAN2*/ +#endif /*RT_USING_CAN*/ diff --git a/bsp/stm32f10x/rtconfig.h b/bsp/stm32f10x/rtconfig.h index f448846001..e233006509 100644 --- a/bsp/stm32f10x/rtconfig.h +++ b/bsp/stm32f10x/rtconfig.h @@ -82,7 +82,7 @@ #define RT_USING_PIN -#define RT_USING_CAN +//#define RT_USING_CAN #define RT_CAN_USING_BUS_HOOK |