From 22490a9cfc52f8bc89b845103d01055fef726f2b Mon Sep 17 00:00:00 2001 From: bernard Date: Mon, 9 Oct 2017 15:12:03 +0800 Subject: [PATCH] [bsp] Update SConscript for stm32f429 apollo bsp --- bsp/stm32f429-apollo/applications/SConscript | 11 +++-------- bsp/stm32f429-apollo/drivers/SConscript | 8 ++++---- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/bsp/stm32f429-apollo/applications/SConscript b/bsp/stm32f429-apollo/applications/SConscript index d0980be7f7..1a7ea1cf57 100644 --- a/bsp/stm32f429-apollo/applications/SConscript +++ b/bsp/stm32f429-apollo/applications/SConscript @@ -1,21 +1,16 @@ -Import('RTT_ROOT') -Import('rtconfig') from building import * -cwd = os.path.join(str(Dir('#')), 'applications') -#src = Glob('*.c') +cwd = GetCurrentDir() CPPPATH = [cwd, str(Dir('#'))] - -src = Split(""" +src = Split(""" application.c startup.c """) -# add gpio drivers. +# add UI engine demo. if GetDepend('RT_USING_GUIENGINE'): src += ['rtgui_demo.c'] - group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/stm32f429-apollo/drivers/SConscript b/bsp/stm32f429-apollo/drivers/SConscript index 9d8e32a77d..d6a93ac1b5 100644 --- a/bsp/stm32f429-apollo/drivers/SConscript +++ b/bsp/stm32f429-apollo/drivers/SConscript @@ -1,8 +1,6 @@ -Import('RTT_ROOT') -Import('rtconfig') from building import * -cwd = os.path.join(str(Dir('#')), 'drivers') +cwd = GetCurrentDir() # add the general drivers. src = Split(""" @@ -15,7 +13,9 @@ drv_nand.c drv_mpu.c """) -#drv_sdio_sd.c +# add sdio driver +if GetDepend('RT_USING_DFS'): + src += ['drv_sdio_sd.c'] # add Ethernet drivers. if GetDepend('RT_USING_LWIP'):