diff options
| author | Meco Man <[email protected]> | 2022-05-06 15:50:57 -0400 |
|---|---|---|
| committer | guo <[email protected]> | 2022-05-09 22:54:36 +0800 |
| commit | 96dd783f37d44556c8d470a13b45b6bd4e28ac2c (patch) | |
| tree | 385a32ca1f5c32f7196a34b32d3e0ba8a3b8352d /bsp/stm32/libraries/STM32L1xx_HAL/SConscript | |
| parent | 4171fcbb0612aa928f98797e3a982a0921cea35e (diff) | |
[cmsis] avoid conflict between cmsis5 and bsp cmsis
Diffstat (limited to 'bsp/stm32/libraries/STM32L1xx_HAL/SConscript')
| -rw-r--r-- | bsp/stm32/libraries/STM32L1xx_HAL/SConscript | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/SConscript b/bsp/stm32/libraries/STM32L1xx_HAL/SConscript index 9c3cd96838..c829a0a592 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32L1xx_HAL/SConscript @@ -66,15 +66,15 @@ if GetDepend(['RT_USING_SDIO']): if GetDepend(['RT_USING_AUDIO']): src += ['STM32L1xx_HAL_Driver/Src/stm32L1xx_hal_i2s.c'] - - if GetDepend(['BSP_USING_ON_CHIP_FLASH']): src += ['STM32L1xx_HAL_Driver/Src/stm32L1xx_hal_flash.c'] src += ['STM32L1xx_HAL_Driver/Src/stm32L1xx_hal_flash_ex.c'] path = [cwd + '/CMSIS/Device/ST/STM32L1xx/Include', - cwd + '/STM32L1xx_HAL_Driver/Inc', - cwd + '/CMSIS/Include'] + cwd + '/STM32L1xx_HAL_Driver/Inc'] + +if not GetDepend('PKG_CMSIS_CORE'): + path += [cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) |