From 1be90253d0c887aecbdeab0800520a1e30cabdec Mon Sep 17 00:00:00 2001 From: tyustli <1225613647@qq.com> Date: Tue, 26 Mar 2019 13:58:33 +0800 Subject: delete the CMSIS from components and add the CMSIS and add the CMSIS in some specific BSP --- bsp/stm32/libraries/STM32F0xx_HAL/SConscript | 5 +---- bsp/stm32/libraries/STM32F1xx_HAL/SConscript | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'bsp/stm32/libraries') diff --git a/bsp/stm32/libraries/STM32F0xx_HAL/SConscript b/bsp/stm32/libraries/STM32F0xx_HAL/SConscript index daab047603..e8ac68c42c 100644 --- a/bsp/stm32/libraries/STM32F0xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32F0xx_HAL/SConscript @@ -78,12 +78,9 @@ if GetDepend(['BSP_USING_ON_CHIP_FLASH']): src += ['STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_flash_ex.c'] path = [cwd + '/CMSIS/Device/ST/STM32F0xx/Include', - cwd + '/STM32F0xx_HAL_Driver/Inc', + cwd + '/STM32F0xx_HAL_Driver/Inc', cwd + '/CMSIS/Include'] -if GetDepend(['RT_USING_RTT_CMSIS']): - path += [RTT_ROOT + '/components/CMSIS/Include'] - CPPDEFINES = ['USE_HAL_DRIVER'] group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) diff --git a/bsp/stm32/libraries/STM32F1xx_HAL/SConscript b/bsp/stm32/libraries/STM32F1xx_HAL/SConscript index 37101b6c74..cc20d36181 100644 --- a/bsp/stm32/libraries/STM32F1xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32F1xx_HAL/SConscript @@ -84,9 +84,6 @@ path = [cwd + '/CMSIS/Device/ST/STM32F1xx/Include', cwd + '/STM32F1xx_HAL_Driver/Inc', cwd + '/CMSIS/Include'] -if GetDepend(['RT_USING_RTT_CMSIS']): - path += [RTT_ROOT + '/components/CMSIS/Include'] - CPPDEFINES = ['USE_HAL_DRIVER'] group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) -- cgit v1.3.1