diff options
| author | guo <[email protected]> | 2022-03-30 16:59:20 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-03-30 16:59:20 +0800 |
| commit | 201bd8871dff1efd1f48bdfd01a1938e4547ffd5 (patch) | |
| tree | af178f8e15751e09a51a7d31dbaa6d4ed068d798 /bsp/stm32/stm32l475-atk-pandora | |
| parent | 4f5d1b0ce0eb14006d39e815d948bbba16229c19 (diff) | |
Revert "优化build输出" (#5747)v4.1.0
Diffstat (limited to 'bsp/stm32/stm32l475-atk-pandora')
| -rw-r--r-- | bsp/stm32/stm32l475-atk-pandora/SConstruct | 15 | ||||
| -rw-r--r-- | bsp/stm32/stm32l475-atk-pandora/board/SConscript | 7 |
2 files changed, 6 insertions, 16 deletions
diff --git a/bsp/stm32/stm32l475-atk-pandora/SConstruct b/bsp/stm32/stm32l475-atk-pandora/SConstruct index a47cac3b41..dcd7ae2889 100644 --- a/bsp/stm32/stm32l475-atk-pandora/SConstruct +++ b/bsp/stm32/stm32l475-atk-pandora/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,13 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32L4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(os.getcwd(), 'board', 'ports', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32l475-atk-pandora/board/SConscript b/bsp/stm32/stm32l475-atk-pandora/board/SConscript index bff91b7deb..29efa41d65 100644 --- a/bsp/stm32/stm32l475-atk-pandora/board/SConscript +++ b/bsp/stm32/stm32l475-atk-pandora/board/SConscript @@ -17,7 +17,7 @@ if GetDepend(['BSP_USING_KEY']): if GetDepend(['BSP_USING_QSPI_FLASH']): src += Glob('ports/drv_qspi_flash.c') - + if GetDepend(['BSP_USING_SDCARD']): src += Glob('ports/drv_sdcard.c') @@ -39,7 +39,7 @@ path += [cwd + '/CubeMX_Config/Inc'] if GetDepend(['BSP_USING_AUDIO']): path += [cwd + '/ports/audio'] - + startup_path_prefix = SDK_LIB if rtconfig.CROSS_TOOL == 'gcc': @@ -49,8 +49,7 @@ elif rtconfig.CROSS_TOOL == 'keil': elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l475xx.s'] -CPPDEFINES = ['STM32L475xx'] +CPPDEFINES = ['STM32L475xx'] group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') - |