From 95ebb3d7b6e4e8fd942ea436b373b28bbbc42c3a Mon Sep 17 00:00:00 2001 From: jeromecoutant Date: Wed, 17 Feb 2021 15:22:53 +0100 Subject: [PATCH] STM32L1 : directory restructuring --- .../CMSIS}/stm32l151xc.h | 0 .../CMSIS}/stm32l152xc.h | 0 .../CMSIS}/stm32l152xe.h | 0 .../device => STM32Cube_FW/CMSIS}/stm32l1xx.h | 6 +- .../CMSIS}/system_stm32l1xx.h | 2 - .../STM32Cube_FW/CMakeLists.txt | 74 +++++ .../Legacy}/stm32_hal_legacy.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_adc.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_adc.h | 3 - .../stm32l1xx_hal_adc_ex.c | 0 .../stm32l1xx_hal_adc_ex.h | 0 .../stm32l1xx_hal_comp.c | 0 .../stm32l1xx_hal_comp.h | 0 .../stm32l1xx_hal_comp_ex.h | 0 .../stm32l1xx_hal_cortex.c | 0 .../stm32l1xx_hal_cortex.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_crc.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_crc.h | 0 .../stm32l1xx_hal_cryp.c | 0 .../stm32l1xx_hal_cryp.h | 0 .../stm32l1xx_hal_cryp_ex.c | 0 .../stm32l1xx_hal_cryp_ex.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_dac.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_dac.h | 0 .../stm32l1xx_hal_dac_ex.c | 0 .../stm32l1xx_hal_dac_ex.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_def.h | 4 +- .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_dma.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_dma.h | 0 .../stm32l1xx_hal_flash.c | 0 .../stm32l1xx_hal_flash.h | 0 .../stm32l1xx_hal_flash_ex.c | 0 .../stm32l1xx_hal_flash_ex.h | 0 .../stm32l1xx_hal_flash_ramfunc.c | 0 .../stm32l1xx_hal_flash_ramfunc.h | 0 .../stm32l1xx_hal_gpio.c | 0 .../stm32l1xx_hal_gpio.h | 0 .../stm32l1xx_hal_gpio_ex.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_i2c.c | 6 +- .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_i2c.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_i2s.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_i2s.h | 0 .../stm32l1xx_hal_irda.c | 0 .../stm32l1xx_hal_irda.h | 0 .../stm32l1xx_hal_iwdg.c | 0 .../stm32l1xx_hal_iwdg.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_lcd.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_lcd.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_nor.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_nor.h | 0 .../stm32l1xx_hal_opamp.c | 0 .../stm32l1xx_hal_opamp.h | 0 .../stm32l1xx_hal_opamp_ex.c | 0 .../stm32l1xx_hal_opamp_ex.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_pcd.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_pcd.h | 0 .../stm32l1xx_hal_pcd_ex.c | 0 .../stm32l1xx_hal_pcd_ex.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_pwr.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_pwr.h | 0 .../stm32l1xx_hal_pwr_ex.c | 0 .../stm32l1xx_hal_pwr_ex.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_rcc.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_rcc.h | 0 .../stm32l1xx_hal_rcc_ex.c | 0 .../stm32l1xx_hal_rcc_ex.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_rtc.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_rtc.h | 1 - .../stm32l1xx_hal_rtc_ex.c | 0 .../stm32l1xx_hal_rtc_ex.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_sd.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_sd.h | 0 .../stm32l1xx_hal_smartcard.c | 0 .../stm32l1xx_hal_smartcard.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_spi.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_spi.h | 0 .../stm32l1xx_hal_spi_ex.c | 0 .../stm32l1xx_hal_spi_ex.h | 0 .../stm32l1xx_hal_sram.c | 0 .../stm32l1xx_hal_sram.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_tim.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_hal_tim.h | 0 .../stm32l1xx_hal_tim_ex.c | 0 .../stm32l1xx_hal_tim_ex.h | 0 .../stm32l1xx_hal_uart.c | 0 .../stm32l1xx_hal_uart.h | 0 .../stm32l1xx_hal_usart.c | 0 .../stm32l1xx_hal_usart.h | 0 .../stm32l1xx_hal_wwdg.c | 0 .../stm32l1xx_hal_wwdg.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_adc.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_adc.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_bus.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_comp.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_comp.h | 0 .../stm32l1xx_ll_cortex.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_crc.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_crc.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_dac.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_dac.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_dma.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_dma.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_exti.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_exti.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_fsmc.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_fsmc.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_gpio.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_gpio.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_i2c.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_i2c.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_iwdg.h | 0 .../stm32l1xx_ll_opamp.c | 0 .../stm32l1xx_ll_opamp.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_pwr.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_pwr.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_rcc.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_rcc.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_rtc.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_rtc.h | 0 .../stm32l1xx_ll_sdmmc.c | 0 .../stm32l1xx_ll_sdmmc.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_spi.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_spi.h | 0 .../stm32l1xx_ll_system.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_tim.c | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_tim.h | 0 .../stm32l1xx_ll_usart.c | 0 .../stm32l1xx_ll_usart.h | 0 .../stm32l1xx_ll_utils.c | 0 .../stm32l1xx_ll_utils.h | 0 .../STM32L1xx_HAL_Driver}/stm32l1xx_ll_wwdg.h | 0 .../stm32l1xx_hal_conf.h | 14 +- .../system_stm32l1xx.c | 14 +- .../TOOLCHAIN_ARM/startup_stm32l152xc.S | 0 .../TOOLCHAIN_ARM/stm32l152rc.sct | 0 .../TOOLCHAIN_GCC_ARM/STM32L152XC.ld | 0 .../TOOLCHAIN_GCC_ARM/startup_stm32l152xc.S | 0 .../TOOLCHAIN_IAR/startup_stm32l152xc.S | 0 .../TOOLCHAIN_IAR/stm32l152xc.icf | 0 .../{device => }/cmsis_nvic.h | 0 .../TARGET_MOTE_L152RC/device/stm32l1xx.h | 262 ------------------ .../device/system_stm32l1xx.h | 126 --------- .../{device => }/system_clock.c | 0 .../{device => }/us_ticker_data.h | 0 .../TOOLCHAIN_ARM/startup_stm32l152xe.S | 0 .../TOOLCHAIN_ARM/stm32l152re.sct | 0 .../TOOLCHAIN_GCC_ARM/STM32L152XE.ld | 0 .../TOOLCHAIN_GCC_ARM/startup_stm32l152xe.S | 0 .../TOOLCHAIN_IAR/startup_stm32l152xe.S | 0 .../TOOLCHAIN_IAR/stm32l152xe.icf | 0 .../{device => }/cmsis_nvic.h | 0 .../device/system_stm32l1xx.h | 126 --------- .../{device => }/system_clock.c | 45 --- .../{device => }/us_ticker_data.h | 0 .../TOOLCHAIN_ARM/startup_stm32l151xc.S | 0 .../TOOLCHAIN_ARM/stm32l151rc.sct | 0 .../TOOLCHAIN_GCC_ARM/STM32L151XC.ld | 0 .../TOOLCHAIN_GCC_ARM/startup_stm32l151xc.S | 0 .../TOOLCHAIN_IAR/startup_stm32l152xc.S | 0 .../TOOLCHAIN_IAR/stm32l152xc.icf | 0 .../{device => }/cmsis_nvic.h | 0 .../TARGET_XDOT_L151CC/device/stm32l1xx.h | 261 ----------------- .../{device => }/system_clock.c | 0 .../{device => }/us_ticker_data.h | 0 .../TARGET_STM32L1/common_objects.h | 2 + targets/targets.json | 36 ++- 168 files changed, 119 insertions(+), 863 deletions(-) rename targets/TARGET_STM/TARGET_STM32L1/{TARGET_XDOT_L151CC/device => STM32Cube_FW/CMSIS}/stm32l151xc.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{TARGET_MOTE_L152RC/device => STM32Cube_FW/CMSIS}/stm32l152xc.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{TARGET_NUCLEO_L152RE/device => STM32Cube_FW/CMSIS}/stm32l152xe.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{TARGET_NUCLEO_L152RE/device => STM32Cube_FW/CMSIS}/stm32l1xx.h (98%) rename targets/TARGET_STM/TARGET_STM32L1/{TARGET_XDOT_L151CC/device => STM32Cube_FW/CMSIS}/system_stm32l1xx.h (99%) create mode 100644 targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/CMakeLists.txt rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver/Legacy}/stm32_hal_legacy.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_adc.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_adc.h (99%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_adc_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_adc_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_comp.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_comp.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_comp_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_cortex.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_cortex.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_crc.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_crc.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_cryp.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_cryp.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_cryp_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_cryp_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_dac.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_dac.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_dac_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_dac_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_def.h (99%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_dma.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_dma.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_flash.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_flash.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_flash_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_flash_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_flash_ramfunc.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_flash_ramfunc.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_gpio.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_gpio.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_gpio_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_i2c.c (99%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_i2c.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_i2s.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_i2s.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_irda.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_irda.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_iwdg.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_iwdg.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_lcd.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_lcd.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_nor.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_nor.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_opamp.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_opamp.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_opamp_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_opamp_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_pcd.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_pcd.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_pcd_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_pcd_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_pwr.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_pwr.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_pwr_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_pwr_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_rcc.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_rcc.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_rcc_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_rcc_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_rtc.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_rtc.h (99%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_rtc_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_rtc_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_sd.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_sd.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_smartcard.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_smartcard.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_spi.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_spi.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_spi_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_spi_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_sram.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_sram.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_tim.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_tim.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_tim_ex.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_tim_ex.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_uart.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_uart.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_usart.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_usart.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_wwdg.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_hal_wwdg.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_adc.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_adc.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_bus.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_comp.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_comp.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_cortex.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_crc.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_crc.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_dac.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_dac.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_dma.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_dma.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_exti.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_exti.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_fsmc.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_fsmc.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_gpio.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_gpio.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_i2c.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_i2c.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_iwdg.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_opamp.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_opamp.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_pwr.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_pwr.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_rcc.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_rcc.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_rtc.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_rtc.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_sdmmc.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_sdmmc.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_spi.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_spi.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_system.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_tim.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_tim.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_usart.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_usart.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_utils.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_utils.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW/STM32L1xx_HAL_Driver}/stm32l1xx_ll_wwdg.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW}/stm32l1xx_hal_conf.h (93%) rename targets/TARGET_STM/TARGET_STM32L1/{device => STM32Cube_FW}/system_stm32l1xx.c (98%) rename targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/{device => }/TOOLCHAIN_ARM/startup_stm32l152xc.S (100%) rename targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/{device => }/TOOLCHAIN_ARM/stm32l152rc.sct (100%) rename targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/{device => }/TOOLCHAIN_GCC_ARM/STM32L152XC.ld (100%) rename targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/{device => }/TOOLCHAIN_GCC_ARM/startup_stm32l152xc.S (100%) rename targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/{device => }/TOOLCHAIN_IAR/startup_stm32l152xc.S (100%) rename targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/{device => }/TOOLCHAIN_IAR/stm32l152xc.icf (100%) rename targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/{device => }/cmsis_nvic.h (100%) delete mode 100644 targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/stm32l1xx.h delete mode 100644 targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/system_stm32l1xx.h rename targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/{device => }/system_clock.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/{device => }/us_ticker_data.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/{device => }/TOOLCHAIN_ARM/startup_stm32l152xe.S (100%) rename targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/{device => }/TOOLCHAIN_ARM/stm32l152re.sct (100%) rename targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/{device => }/TOOLCHAIN_GCC_ARM/STM32L152XE.ld (100%) rename targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/{device => }/TOOLCHAIN_GCC_ARM/startup_stm32l152xe.S (100%) rename targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/{device => }/TOOLCHAIN_IAR/startup_stm32l152xe.S (100%) rename targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/{device => }/TOOLCHAIN_IAR/stm32l152xe.icf (100%) rename targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/{device => }/cmsis_nvic.h (100%) delete mode 100644 targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/system_stm32l1xx.h rename targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/{device => }/system_clock.c (85%) rename targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/{device => }/us_ticker_data.h (100%) rename targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/{device => }/TOOLCHAIN_ARM/startup_stm32l151xc.S (100%) rename targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/{device => }/TOOLCHAIN_ARM/stm32l151rc.sct (100%) rename targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/{device => }/TOOLCHAIN_GCC_ARM/STM32L151XC.ld (100%) rename targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/{device => }/TOOLCHAIN_GCC_ARM/startup_stm32l151xc.S (100%) rename targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/{device => }/TOOLCHAIN_IAR/startup_stm32l152xc.S (100%) rename targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/{device => }/TOOLCHAIN_IAR/stm32l152xc.icf (100%) rename targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/{device => }/cmsis_nvic.h (100%) delete mode 100644 targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/stm32l1xx.h rename targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/{device => }/system_clock.c (100%) rename targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/{device => }/us_ticker_data.h (100%) diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/stm32l151xc.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/CMSIS/stm32l151xc.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/stm32l151xc.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/CMSIS/stm32l151xc.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/stm32l152xc.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/CMSIS/stm32l152xc.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/stm32l152xc.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/CMSIS/stm32l152xc.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/stm32l152xe.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/CMSIS/stm32l152xe.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/stm32l152xe.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/CMSIS/stm32l152xe.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/stm32l1xx.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/CMSIS/stm32l1xx.h similarity index 98% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/stm32l1xx.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/CMSIS/stm32l1xx.h index 82d3aa2dc1..880f59dde6 100644 --- a/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/stm32l1xx.h +++ b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/CMSIS/stm32l1xx.h @@ -92,9 +92,9 @@ /* #define STM32L152xBA */ /*!< STM32L152C6-A, STM32L152R6-A, STM32L152C8-A, STM32L152R8-A, STM32L152V8-A, STM32L152CB-A, STM32L152RB-A and STM32L152VB-A */ /* #define STM32L152xC */ /*!< STM32L152CC, STM32L152UC, STM32L152RC and STM32L152VC */ /* #define STM32L152xCA */ /*!< STM32L152RC-A, STM32L152VC-A, STM32L152QC and STM32L152ZC */ - /* #define STM32L152xD */ /*!< STM32L152QD, STM32L152RD, STM32L152VD and STM32L152ZD */ + /* #define STM32L152xD */ /*!< STM32L152QD, STM32L152RD, STM32L152VD and STM32L152ZD */ /* #define STM32L152xDX */ /*!< STM32L152VD-X Devices */ -#define STM32L152xE /*!< STM32L152QE, STM32L152RE, STM32L152VE and STM32L152ZE */ + /* #define STM32L152xE */ /*!< STM32L152QE, STM32L152RE, STM32L152VE and STM32L152ZE */ /* #define STM32L162xC */ /*!< STM32L162RC and STM32L162VC */ /* #define STM32L162xCA */ /*!< STM32L162RC-A, STM32L162VC-A, STM32L162QC and STM32L162ZC */ /* #define STM32L162xD */ /*!< STM32L162QD, STM32L162RD, STM32L162VD and STM32L162ZD */ @@ -112,7 +112,7 @@ In this case, these drivers will not be included and the application code will be based on direct access to peripherals registers */ -#define USE_HAL_DRIVER + /*#define USE_HAL_DRIVER */ #endif /* USE_HAL_DRIVER */ /** diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/system_stm32l1xx.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/CMSIS/system_stm32l1xx.h similarity index 99% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/system_stm32l1xx.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/CMSIS/system_stm32l1xx.h index ace20a831f..83af756640 100644 --- a/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/system_stm32l1xx.h +++ b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/CMSIS/system_stm32l1xx.h @@ -104,8 +104,6 @@ extern const uint8_t PLLMulTable[9]; /*!< PLL multipiers table values */ extern void SystemInit(void); extern void SystemCoreClockUpdate(void); -extern void SetSysClock(void); - /** * @} */ diff --git a/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/CMakeLists.txt new file mode 100644 index 0000000000..43d1aa5da3 --- /dev/null +++ b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/CMakeLists.txt @@ -0,0 +1,74 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +target_sources(mbed-core + INTERFACE + STM32L1xx_HAL_Driver/stm32l1xx_hal.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_adc.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_adc_ex.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_comp.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_cortex.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_crc.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_cryp.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_cryp_ex.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_dac.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_dac_ex.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_dma.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_flash.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_flash_ex.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_flash_ramfunc.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_gpio.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_i2c.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_i2s.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_irda.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_iwdg.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_lcd.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_nor.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_opamp.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_opamp_ex.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_pcd.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_pcd_ex.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_pwr.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_pwr_ex.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_rcc.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_rcc_ex.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_rtc.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_rtc_ex.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_sd.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_smartcard.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_spi.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_spi_ex.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_sram.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_tim.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_tim_ex.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_uart.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_usart.c + STM32L1xx_HAL_Driver/stm32l1xx_hal_wwdg.c + STM32L1xx_HAL_Driver/stm32l1xx_ll_adc.c + STM32L1xx_HAL_Driver/stm32l1xx_ll_comp.c + STM32L1xx_HAL_Driver/stm32l1xx_ll_crc.c + STM32L1xx_HAL_Driver/stm32l1xx_ll_dac.c + STM32L1xx_HAL_Driver/stm32l1xx_ll_dma.c + STM32L1xx_HAL_Driver/stm32l1xx_ll_exti.c + STM32L1xx_HAL_Driver/stm32l1xx_ll_fsmc.c + STM32L1xx_HAL_Driver/stm32l1xx_ll_gpio.c + STM32L1xx_HAL_Driver/stm32l1xx_ll_i2c.c + STM32L1xx_HAL_Driver/stm32l1xx_ll_opamp.c + STM32L1xx_HAL_Driver/stm32l1xx_ll_pwr.c + STM32L1xx_HAL_Driver/stm32l1xx_ll_rcc.c + STM32L1xx_HAL_Driver/stm32l1xx_ll_rtc.c + STM32L1xx_HAL_Driver/stm32l1xx_ll_sdmmc.c + STM32L1xx_HAL_Driver/stm32l1xx_ll_spi.c + STM32L1xx_HAL_Driver/stm32l1xx_ll_tim.c + STM32L1xx_HAL_Driver/stm32l1xx_ll_usart.c + STM32L1xx_HAL_Driver/stm32l1xx_ll_utils.c + system_stm32l1xx.c +) + +target_include_directories(mbed-core + INTERFACE + . + CMSIS + STM32L1xx_HAL_Driver + STM32L1xx_HAL_Driver/Legacy +) diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32_hal_legacy.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/Legacy/stm32_hal_legacy.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32_hal_legacy.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/Legacy/stm32_hal_legacy.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_adc.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_adc.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_adc.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_adc.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_adc.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_adc.h similarity index 99% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_adc.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_adc.h index f06aaf2bdd..371ebe1c5a 100644 --- a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_adc.h +++ b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_adc.h @@ -44,9 +44,6 @@ /* Includes ------------------------------------------------------------------*/ #include "stm32l1xx_hal_def.h" -/* Include low level driver */ -#include "stm32l1xx_ll_adc.h" - /** @addtogroup STM32L1xx_HAL_Driver * @{ */ diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_adc_ex.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_adc_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_adc_ex.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_adc_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_adc_ex.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_adc_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_adc_ex.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_adc_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_comp.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_comp.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_comp.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_comp.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_comp.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_comp.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_comp.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_comp.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_comp_ex.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_comp_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_comp_ex.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_comp_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_cortex.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_cortex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_cortex.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_cortex.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_cortex.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_cortex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_cortex.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_cortex.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_crc.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_crc.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_crc.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_crc.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_crc.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_crc.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_crc.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_crc.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_cryp.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_cryp.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_cryp.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_cryp.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_cryp.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_cryp.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_cryp.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_cryp.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_cryp_ex.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_cryp_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_cryp_ex.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_cryp_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_cryp_ex.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_cryp_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_cryp_ex.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_cryp_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_dac.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_dac.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_dac.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_dac.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_dac.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_dac.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_dac.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_dac.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_dac_ex.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_dac_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_dac_ex.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_dac_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_dac_ex.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_dac_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_dac_ex.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_dac_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_def.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_def.h similarity index 99% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_def.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_def.h index e235a20133..f43a59e9ff 100644 --- a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_def.h +++ b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_def.h @@ -44,7 +44,7 @@ /* Includes ------------------------------------------------------------------*/ #include "stm32l1xx.h" -#include "stm32_hal_legacy.h" +#include "Legacy/stm32_hal_legacy.h" #include /* Exported types ------------------------------------------------------------*/ @@ -122,7 +122,7 @@ typedef enum }while (0) #endif /* USE_RTOS */ -#if defined ( __GNUC__ ) && !defined ( __CC_ARM ) +#if defined ( __GNUC__ ) #ifndef __weak #define __weak __attribute__((weak)) #endif /* __weak */ diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_dma.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_dma.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_dma.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_dma.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_dma.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_dma.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_dma.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_dma.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_flash.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_flash.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_flash.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_flash.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_flash.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_flash.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_flash.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_flash.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_flash_ex.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_flash_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_flash_ex.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_flash_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_flash_ex.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_flash_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_flash_ex.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_flash_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_flash_ramfunc.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_flash_ramfunc.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_flash_ramfunc.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_flash_ramfunc.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_flash_ramfunc.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_flash_ramfunc.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_flash_ramfunc.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_flash_ramfunc.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_gpio.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_gpio.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_gpio.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_gpio.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_gpio.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_gpio.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_gpio.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_gpio.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_gpio_ex.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_gpio_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_gpio_ex.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_gpio_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_i2c.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_i2c.c similarity index 99% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_i2c.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_i2c.c index 41482a3e34..e0256525b3 100644 --- a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_i2c.c +++ b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_i2c.c @@ -1335,7 +1335,7 @@ HAL_StatusTypeDef HAL_I2C_Master_Receive_IT(I2C_HandleTypeDef *hi2c, uint16_t De /* Enable Acknowledge */ SET_BIT(hi2c->Instance->CR1, I2C_CR1_ACK); - + /* Generate Start */ SET_BIT(hi2c->Instance->CR1, I2C_CR1_START); @@ -1530,7 +1530,7 @@ HAL_StatusTypeDef HAL_I2C_Master_Sequential_Receive_IT(I2C_HandleTypeDef *hi2c, { /* Enable Acknowledge */ SET_BIT(hi2c->Instance->CR1, I2C_CR1_ACK); - + /* Generate Start */ SET_BIT(hi2c->Instance->CR1, I2C_CR1_START); } @@ -1538,7 +1538,7 @@ HAL_StatusTypeDef HAL_I2C_Master_Sequential_Receive_IT(I2C_HandleTypeDef *hi2c, { /* Enable Acknowledge */ SET_BIT(hi2c->Instance->CR1, I2C_CR1_ACK); - + /* Generate ReStart */ SET_BIT(hi2c->Instance->CR1, I2C_CR1_START); } diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_i2c.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_i2c.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_i2c.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_i2c.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_i2s.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_i2s.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_i2s.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_i2s.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_i2s.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_i2s.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_i2s.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_i2s.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_irda.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_irda.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_irda.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_irda.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_irda.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_irda.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_irda.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_irda.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_iwdg.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_iwdg.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_iwdg.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_iwdg.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_iwdg.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_iwdg.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_iwdg.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_iwdg.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_lcd.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_lcd.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_lcd.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_lcd.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_lcd.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_lcd.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_lcd.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_lcd.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_nor.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_nor.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_nor.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_nor.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_nor.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_nor.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_nor.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_nor.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_opamp.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_opamp.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_opamp.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_opamp.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_opamp.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_opamp.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_opamp.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_opamp.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_opamp_ex.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_opamp_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_opamp_ex.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_opamp_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_opamp_ex.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_opamp_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_opamp_ex.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_opamp_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_pcd.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_pcd.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_pcd.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_pcd.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_pcd.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_pcd.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_pcd.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_pcd.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_pcd_ex.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_pcd_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_pcd_ex.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_pcd_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_pcd_ex.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_pcd_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_pcd_ex.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_pcd_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_pwr.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_pwr.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_pwr.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_pwr.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_pwr.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_pwr.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_pwr.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_pwr.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_pwr_ex.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_pwr_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_pwr_ex.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_pwr_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_pwr_ex.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_pwr_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_pwr_ex.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_pwr_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_rcc.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_rcc.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_rcc.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_rcc.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_rcc.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_rcc.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_rcc.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_rcc.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_rcc_ex.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_rcc_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_rcc_ex.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_rcc_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_rcc_ex.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_rcc_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_rcc_ex.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_rcc_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_rtc.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_rtc.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_rtc.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_rtc.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_rtc.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_rtc.h similarity index 99% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_rtc.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_rtc.h index 231511cc0c..3b9b08ac5c 100644 --- a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_rtc.h +++ b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_rtc.h @@ -43,7 +43,6 @@ /* Includes ------------------------------------------------------------------*/ #include "stm32l1xx_hal_def.h" -#include "stm32l1xx_ll_rtc.h" /** @addtogroup STM32L1xx_HAL_Driver * @{ diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_rtc_ex.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_rtc_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_rtc_ex.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_rtc_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_rtc_ex.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_rtc_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_rtc_ex.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_rtc_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_sd.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_sd.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_sd.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_sd.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_sd.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_sd.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_sd.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_sd.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_smartcard.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_smartcard.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_smartcard.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_smartcard.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_smartcard.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_smartcard.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_smartcard.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_smartcard.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_spi.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_spi.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_spi.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_spi.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_spi.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_spi.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_spi.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_spi.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_spi_ex.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_spi_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_spi_ex.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_spi_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_spi_ex.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_spi_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_spi_ex.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_spi_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_sram.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_sram.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_sram.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_sram.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_sram.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_sram.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_sram.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_sram.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_tim.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_tim.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_tim.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_tim.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_tim.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_tim.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_tim.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_tim.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_tim_ex.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_tim_ex.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_tim_ex.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_tim_ex.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_tim_ex.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_tim_ex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_tim_ex.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_tim_ex.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_uart.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_uart.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_uart.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_uart.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_uart.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_uart.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_uart.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_uart.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_usart.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_usart.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_usart.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_usart.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_usart.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_usart.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_usart.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_usart.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_wwdg.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_wwdg.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_wwdg.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_wwdg.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_wwdg.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_wwdg.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_wwdg.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_hal_wwdg.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_adc.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_adc.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_adc.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_adc.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_adc.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_adc.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_adc.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_adc.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_bus.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_bus.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_bus.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_bus.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_comp.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_comp.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_comp.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_comp.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_comp.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_comp.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_comp.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_comp.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_cortex.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_cortex.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_cortex.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_cortex.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_crc.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_crc.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_crc.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_crc.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_crc.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_crc.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_crc.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_crc.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_dac.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_dac.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_dac.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_dac.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_dac.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_dac.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_dac.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_dac.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_dma.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_dma.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_dma.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_dma.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_dma.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_dma.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_dma.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_dma.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_exti.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_exti.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_exti.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_exti.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_exti.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_exti.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_exti.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_exti.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_fsmc.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_fsmc.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_fsmc.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_fsmc.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_fsmc.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_fsmc.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_fsmc.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_fsmc.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_gpio.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_gpio.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_gpio.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_gpio.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_gpio.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_gpio.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_gpio.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_gpio.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_i2c.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_i2c.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_i2c.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_i2c.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_i2c.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_i2c.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_i2c.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_i2c.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_iwdg.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_iwdg.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_iwdg.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_iwdg.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_opamp.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_opamp.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_opamp.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_opamp.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_opamp.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_opamp.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_opamp.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_opamp.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_pwr.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_pwr.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_pwr.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_pwr.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_pwr.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_pwr.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_pwr.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_pwr.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_rcc.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_rcc.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_rcc.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_rcc.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_rcc.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_rcc.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_rcc.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_rcc.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_rtc.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_rtc.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_rtc.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_rtc.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_rtc.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_rtc.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_rtc.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_rtc.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_sdmmc.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_sdmmc.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_sdmmc.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_sdmmc.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_sdmmc.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_sdmmc.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_sdmmc.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_sdmmc.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_spi.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_spi.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_spi.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_spi.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_spi.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_spi.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_spi.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_spi.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_system.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_system.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_system.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_system.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_tim.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_tim.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_tim.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_tim.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_tim.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_tim.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_tim.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_tim.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_usart.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_usart.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_usart.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_usart.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_usart.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_usart.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_usart.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_usart.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_utils.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_utils.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_utils.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_utils.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_utils.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_utils.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_utils.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_utils.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_wwdg.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_wwdg.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_ll_wwdg.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/STM32L1xx_HAL_Driver/stm32l1xx_ll_wwdg.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_conf.h b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/stm32l1xx_hal_conf.h similarity index 93% rename from targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_conf.h rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/stm32l1xx_hal_conf.h index b81fe8c02d..fa90fea741 100644 --- a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_conf.h +++ b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/stm32l1xx_hal_conf.h @@ -265,19 +265,7 @@ /* Exported macro ------------------------------------------------------------*/ #ifdef USE_FULL_ASSERT -// ALL MBED targets use same stm32_assert.h -/** - * @brief The assert_param macro is used for function's parameters check. - * @param expr: If expr is false, it calls assert_failed function - * which reports the name of the source file and the source - * line number of the call that failed. - * If expr is true, it returns no value. - * @retval None - */ - //#define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__)) -/* Exported functions ------------------------------------------------------- */ - //void assert_failed(uint8_t* file, uint32_t line); -#include "stm32_assert.h" +#include "stm32_assert.h" // MBED patch #else #define assert_param(expr) ((void)0U) #endif /* USE_FULL_ASSERT */ diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/system_stm32l1xx.c b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/system_stm32l1xx.c similarity index 98% rename from targets/TARGET_STM/TARGET_STM32L1/device/system_stm32l1xx.c rename to targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/system_stm32l1xx.c index e424d020ca..7e1fdf865a 100644 --- a/targets/TARGET_STM/TARGET_STM32L1/device/system_stm32l1xx.c +++ b/targets/TARGET_STM/TARGET_STM32L1/STM32Cube_FW/system_stm32l1xx.c @@ -61,6 +61,7 @@ */ #include "stm32l1xx.h" +#include "mbed_toolchain.h" /** * @} @@ -146,10 +147,6 @@ const uint8_t APBPrescTable[8] = {0U, 0U, 0U, 0U, 1U, 2U, 3U, 4U}; * @{ */ -/*+ MBED */ -#if 0 -/*- MBED */ - /** * @brief Setup the microcontroller system. * Initialize the Embedded Flash Interface, the PLL and update the @@ -157,7 +154,7 @@ const uint8_t APBPrescTable[8] = {0U, 0U, 0U, 0U, 1U, 2U, 3U, 4U}; * @param None * @retval None */ -void SystemInit (void) +MBED_WEAK void SystemInit (void) { /*!< Set MSION bit */ RCC->CR |= (uint32_t)0x00000100; @@ -184,14 +181,11 @@ void SystemInit (void) #ifdef VECT_TAB_SRAM SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */ #else - SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */ +#include "nvic_addr.h" // MBED + SCB->VTOR = NVIC_FLASH_VECTOR_ADDRESS; // MBED #endif } -/*+ MBED */ -#endif -/*- MBED */ - /** * @brief Update SystemCoreClock according to Clock Register Values * The SystemCoreClock variable contains the core clock (HCLK), it can diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/TOOLCHAIN_ARM/startup_stm32l152xc.S b/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/TOOLCHAIN_ARM/startup_stm32l152xc.S similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/TOOLCHAIN_ARM/startup_stm32l152xc.S rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/TOOLCHAIN_ARM/startup_stm32l152xc.S diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/TOOLCHAIN_ARM/stm32l152rc.sct b/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/TOOLCHAIN_ARM/stm32l152rc.sct similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/TOOLCHAIN_ARM/stm32l152rc.sct rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/TOOLCHAIN_ARM/stm32l152rc.sct diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/TOOLCHAIN_GCC_ARM/STM32L152XC.ld b/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/TOOLCHAIN_GCC_ARM/STM32L152XC.ld similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/TOOLCHAIN_GCC_ARM/STM32L152XC.ld rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/TOOLCHAIN_GCC_ARM/STM32L152XC.ld diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/TOOLCHAIN_GCC_ARM/startup_stm32l152xc.S b/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/TOOLCHAIN_GCC_ARM/startup_stm32l152xc.S similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/TOOLCHAIN_GCC_ARM/startup_stm32l152xc.S rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/TOOLCHAIN_GCC_ARM/startup_stm32l152xc.S diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/TOOLCHAIN_IAR/startup_stm32l152xc.S b/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/TOOLCHAIN_IAR/startup_stm32l152xc.S similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/TOOLCHAIN_IAR/startup_stm32l152xc.S rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/TOOLCHAIN_IAR/startup_stm32l152xc.S diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/TOOLCHAIN_IAR/stm32l152xc.icf b/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/TOOLCHAIN_IAR/stm32l152xc.icf similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/TOOLCHAIN_IAR/stm32l152xc.icf rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/TOOLCHAIN_IAR/stm32l152xc.icf diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/cmsis_nvic.h b/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/cmsis_nvic.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/cmsis_nvic.h rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/cmsis_nvic.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/stm32l1xx.h b/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/stm32l1xx.h deleted file mode 100644 index 7eef4b00b6..0000000000 --- a/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/stm32l1xx.h +++ /dev/null @@ -1,262 +0,0 @@ -/** - ****************************************************************************** - * @file stm32l1xx.h - * @author MCD Application Team - * @brief CMSIS STM32L1xx Device Peripheral Access Layer Header File. - * - * The file is the unique include file that the application programmer - * is using in the C source code, usually in main.c. This file contains: - * - Configuration section that allows to select: - * - The STM32L1xx device used in the target application - * - To use or not the peripheral’s drivers in application code(i.e. - * code will be based on direct access to peripheral’s registers - * rather than drivers API), this option is controlled by - * "#define USE_HAL_DRIVER" - * - ****************************************************************************** - * @attention - * - *

© COPYRIGHT(c) 2017 STMicroelectronics

- * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************** - */ - -/** @addtogroup CMSIS - * @{ - */ - -/** @addtogroup stm32l1xx - * @{ - */ - -#ifndef __STM32L1XX_H -#define __STM32L1XX_H - -#ifdef __cplusplus - extern "C" { -#endif /* __cplusplus */ - -/** @addtogroup Library_configuration_section - * @{ - */ - -/** - * @brief STM32 Family - */ -#if !defined (STM32L1) -#define STM32L1 -#endif /* STM32L1 */ - - -/* Uncomment the line below according to the target STM32L device used in your - application - */ - -#if !defined (STM32L100xB) && !defined (STM32L100xBA) && !defined (STM32L100xC) && \ - !defined (STM32L151xB) && !defined (STM32L151xBA) && !defined (STM32L151xC) && !defined (STM32L151xCA) && !defined (STM32L151xD) && !defined (STM32L151xDX) && !defined (STM32L151xE) && \ - !defined (STM32L152xB) && !defined (STM32L152xBA) && !defined (STM32L152xC) && !defined (STM32L152xCA) && !defined (STM32L152xD) && !defined (STM32L152xDX) && !defined (STM32L152xE) && \ - !defined (STM32L162xC) && !defined (STM32L162xCA) && !defined (STM32L162xD) && !defined (STM32L162xDX) && !defined (STM32L162xE) - /* #define STM32L100xB */ /*!< STM32L100C6, STM32L100R and STM32L100RB Devices */ - /* #define STM32L100xBA */ /*!< STM32L100C6-A, STM32L100R8-A and STM32L100RB-A Devices */ - /* #define STM32L100xC */ /*!< STM32L100RC Devices */ - /* #define STM32L151xB */ /*!< STM32L151C6, STM32L151R6, STM32L151C8, STM32L151R8, STM32L151V8, STM32L151CB, STM32L151RB and STM32L151VB */ - /* #define STM32L151xBA */ /*!< STM32L151C6-A, STM32L151R6-A, STM32L151C8-A, STM32L151R8-A, STM32L151V8-A, STM32L151CB-A, STM32L151RB-A and STM32L151VB-A */ - /* #define STM32L151xC */ /*!< STM32L151CC, STM32L151UC, STM32L151RC and STM32L151VC */ - /* #define STM32L151xCA */ /*!< STM32L151RC-A, STM32L151VC-A, STM32L151QC and STM32L151ZC */ - /* #define STM32L151xD */ /*!< STM32L151QD, STM32L151RD, STM32L151VD & STM32L151ZD */ - /* #define STM32L151xDX */ /*!< STM32L151VD-X Devices */ - /* #define STM32L151xE */ /*!< STM32L151QE, STM32L151RE, STM32L151VE and STM32L151ZE */ - /* #define STM32L152xB */ /*!< STM32L152C6, STM32L152R6, STM32L152C8, STM32L152R8, STM32L152V8, STM32L152CB, STM32L152RB and STM32L152VB */ - /* #define STM32L152xBA */ /*!< STM32L152C6-A, STM32L152R6-A, STM32L152C8-A, STM32L152R8-A, STM32L152V8-A, STM32L152CB-A, STM32L152RB-A and STM32L152VB-A */ -#define STM32L152xC /*!< STM32L152CC, STM32L152UC, STM32L152RC and STM32L152VC */ - /* #define STM32L152xCA */ /*!< STM32L152RC-A, STM32L152VC-A, STM32L152QC and STM32L152ZC */ - /* #define STM32L152xD */ /*!< STM32L152QD, STM32L152RD, STM32L152VD and STM32L152ZD */ - /* #define STM32L152xDX */ /*!< STM32L152VD-X Devices */ - /* #define STM32L152xE */ /*!< STM32L152QE, STM32L152RE, STM32L152VE and STM32L152ZE */ - /* #define STM32L162xC */ /*!< STM32L162RC and STM32L162VC */ - /* #define STM32L162xCA */ /*!< STM32L162RC-A, STM32L162VC-A, STM32L162QC and STM32L162ZC */ - /* #define STM32L162xD */ /*!< STM32L162QD, STM32L162RD, STM32L162VD and STM32L162ZD */ - /* #define STM32L162xDX */ /*!< STM32L162VD-X Devices */ - /* #define STM32L162xE */ /*!< STM32L162RE, STM32L162VE and STM32L162ZE */ -#endif - -/* Tip: To avoid modifying this file each time you need to switch between these - devices, you can define the device in your toolchain compiler preprocessor. - */ - -#if !defined (USE_HAL_DRIVER) -/** - * @brief Comment the line below if you will not use the peripherals drivers. - In this case, these drivers will not be included and the application code will - be based on direct access to peripherals registers - */ -#define USE_HAL_DRIVER -#endif /* USE_HAL_DRIVER */ - -/** - * @brief CMSIS Device version number - */ -#define __STM32L1xx_CMSIS_VERSION_MAIN (0x02) /*!< [31:24] main version */ -#define __STM32L1xx_CMSIS_VERSION_SUB1 (0x02) /*!< [23:16] sub1 version */ -#define __STM32L1xx_CMSIS_VERSION_SUB2 (0x03) /*!< [15:8] sub2 version */ -#define __STM32L1xx_CMSIS_VERSION_RC (0x00) /*!< [7:0] release candidate */ -#define __STM32L1xx_CMSIS_VERSION ((__STM32L1xx_CMSIS_VERSION_MAIN << 24)\ - |(__STM32L1xx_CMSIS_VERSION_SUB1 << 16)\ - |(__STM32L1xx_CMSIS_VERSION_SUB2 << 8 )\ - |(__STM32L1xx_CMSIS_VERSION_RC)) - -/** - * @} - */ - -/** @addtogroup Device_Included - * @{ - */ - -#if defined(STM32L100xB) - #include "stm32l100xb.h" -#elif defined(STM32L100xBA) - #include "stm32l100xba.h" -#elif defined(STM32L100xC) - #include "stm32l100xc.h" -#elif defined(STM32L151xB) - #include "stm32l151xb.h" -#elif defined(STM32L151xBA) - #include "stm32l151xba.h" -#elif defined(STM32L151xC) - #include "stm32l151xc.h" -#elif defined(STM32L151xCA) - #include "stm32l151xca.h" -#elif defined(STM32L151xD) - #include "stm32l151xd.h" -#elif defined(STM32L151xDX) - #include "stm32l151xdx.h" -#elif defined(STM32L151xE) - #include "stm32l151xe.h" -#elif defined(STM32L152xB) - #include "stm32l152xb.h" -#elif defined(STM32L152xBA) - #include "stm32l152xba.h" -#elif defined(STM32L152xC) - #include "stm32l152xc.h" -#elif defined(STM32L152xCA) - #include "stm32l152xca.h" -#elif defined(STM32L152xD) - #include "stm32l152xd.h" -#elif defined(STM32L152xDX) - #include "stm32l152xdx.h" -#elif defined(STM32L152xE) - #include "stm32l152xe.h" -#elif defined(STM32L162xC) - #include "stm32l162xc.h" -#elif defined(STM32L162xCA) - #include "stm32l162xca.h" -#elif defined(STM32L162xD) - #include "stm32l162xd.h" -#elif defined(STM32L162xDX) - #include "stm32l162xdx.h" -#elif defined(STM32L162xE) - #include "stm32l162xe.h" -#else - #error "Please select first the target STM32L1xx device used in your application (in stm32l1xx.h file)" -#endif - -/** - * @} - */ - -/** @addtogroup Exported_types - * @{ - */ -typedef enum -{ - RESET = 0, - SET = !RESET -} FlagStatus, ITStatus; - -typedef enum -{ - DISABLE = 0, - ENABLE = !DISABLE -} FunctionalState; -#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE)) - -typedef enum -{ - ERROR = 0, - SUCCESS = !ERROR -} ErrorStatus; - -/** - * @} - */ - - -/** @addtogroup Exported_macros - * @{ - */ -#define SET_BIT(REG, BIT) ((REG) |= (BIT)) - -#define CLEAR_BIT(REG, BIT) ((REG) &= ~(BIT)) - -#define READ_BIT(REG, BIT) ((REG) & (BIT)) - -#define CLEAR_REG(REG) ((REG) = (0x0)) - -#define WRITE_REG(REG, VAL) ((REG) = (VAL)) - -#define READ_REG(REG) ((REG)) - -#define MODIFY_REG(REG, CLEARMASK, SETMASK) WRITE_REG((REG), (((READ_REG(REG)) & (~(CLEARMASK))) | (SETMASK))) - -#define POSITION_VAL(VAL) (__CLZ(__RBIT(VAL))) - - -/** - * @} - */ - -#if defined (USE_HAL_DRIVER) - #include "stm32l1xx_hal.h" -#endif /* USE_HAL_DRIVER */ - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __STM32L1xx_H */ -/** - * @} - */ - -/** - * @} - */ - - - - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/system_stm32l1xx.h b/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/system_stm32l1xx.h deleted file mode 100644 index ace20a831f..0000000000 --- a/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/system_stm32l1xx.h +++ /dev/null @@ -1,126 +0,0 @@ -/** - ****************************************************************************** - * @file system_stm32l1xx.h - * @author MCD Application Team - * @brief CMSIS Cortex-M3 Device System Source File for STM32L1xx devices. - ****************************************************************************** - * @attention - * - *

© COPYRIGHT(c) 2017 STMicroelectronics

- * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************** - */ - -/** @addtogroup CMSIS - * @{ - */ - -/** @addtogroup stm32l1xx_system - * @{ - */ - -/** - * @brief Define to prevent recursive inclusion - */ -#ifndef __SYSTEM_STM32L1XX_H -#define __SYSTEM_STM32L1XX_H - -#ifdef __cplusplus - extern "C" { -#endif - -/** @addtogroup STM32L1xx_System_Includes - * @{ - */ - -/** - * @} - */ - - -/** @addtogroup STM32L1xx_System_Exported_types - * @{ - */ - /* This variable is updated in three ways: - 1) by calling CMSIS function SystemCoreClockUpdate() - 2) by calling HAL API function HAL_RCC_GetSysClockFreq() - 3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency - Note: If you use this function to configure the system clock; then there - is no need to call the 2 first functions listed above, since SystemCoreClock - variable is updated automatically. - */ -extern uint32_t SystemCoreClock; /*!< System Clock Frequency (Core Clock) */ -/* -*/ -extern const uint8_t AHBPrescTable[16]; /*!< AHB prescalers table values */ -extern const uint8_t APBPrescTable[8]; /*!< APB prescalers table values */ -extern const uint8_t PLLMulTable[9]; /*!< PLL multipiers table values */ - -/** - * @} - */ - -/** @addtogroup STM32L1xx_System_Exported_Constants - * @{ - */ - -/** - * @} - */ - -/** @addtogroup STM32L1xx_System_Exported_Macros - * @{ - */ - -/** - * @} - */ - -/** @addtogroup STM32L1xx_System_Exported_Functions - * @{ - */ - -extern void SystemInit(void); -extern void SystemCoreClockUpdate(void); -extern void SetSysClock(void); - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif /*__SYSTEM_STM32L1XX_H */ - -/** - * @} - */ - -/** - * @} - */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/system_clock.c b/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/system_clock.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/system_clock.c rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/system_clock.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/us_ticker_data.h b/targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/us_ticker_data.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/device/us_ticker_data.h rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_MOTE_L152RC/us_ticker_data.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/TOOLCHAIN_ARM/startup_stm32l152xe.S b/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/TOOLCHAIN_ARM/startup_stm32l152xe.S similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/TOOLCHAIN_ARM/startup_stm32l152xe.S rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/TOOLCHAIN_ARM/startup_stm32l152xe.S diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/TOOLCHAIN_ARM/stm32l152re.sct b/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/TOOLCHAIN_ARM/stm32l152re.sct similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/TOOLCHAIN_ARM/stm32l152re.sct rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/TOOLCHAIN_ARM/stm32l152re.sct diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/TOOLCHAIN_GCC_ARM/STM32L152XE.ld b/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/TOOLCHAIN_GCC_ARM/STM32L152XE.ld similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/TOOLCHAIN_GCC_ARM/STM32L152XE.ld rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/TOOLCHAIN_GCC_ARM/STM32L152XE.ld diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/TOOLCHAIN_GCC_ARM/startup_stm32l152xe.S b/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/TOOLCHAIN_GCC_ARM/startup_stm32l152xe.S similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/TOOLCHAIN_GCC_ARM/startup_stm32l152xe.S rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/TOOLCHAIN_GCC_ARM/startup_stm32l152xe.S diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/TOOLCHAIN_IAR/startup_stm32l152xe.S b/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/TOOLCHAIN_IAR/startup_stm32l152xe.S similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/TOOLCHAIN_IAR/startup_stm32l152xe.S rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/TOOLCHAIN_IAR/startup_stm32l152xe.S diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/TOOLCHAIN_IAR/stm32l152xe.icf b/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/TOOLCHAIN_IAR/stm32l152xe.icf similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/TOOLCHAIN_IAR/stm32l152xe.icf rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/TOOLCHAIN_IAR/stm32l152xe.icf diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/cmsis_nvic.h b/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/cmsis_nvic.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/cmsis_nvic.h rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/cmsis_nvic.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/system_stm32l1xx.h b/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/system_stm32l1xx.h deleted file mode 100644 index ace20a831f..0000000000 --- a/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/system_stm32l1xx.h +++ /dev/null @@ -1,126 +0,0 @@ -/** - ****************************************************************************** - * @file system_stm32l1xx.h - * @author MCD Application Team - * @brief CMSIS Cortex-M3 Device System Source File for STM32L1xx devices. - ****************************************************************************** - * @attention - * - *

© COPYRIGHT(c) 2017 STMicroelectronics

- * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************** - */ - -/** @addtogroup CMSIS - * @{ - */ - -/** @addtogroup stm32l1xx_system - * @{ - */ - -/** - * @brief Define to prevent recursive inclusion - */ -#ifndef __SYSTEM_STM32L1XX_H -#define __SYSTEM_STM32L1XX_H - -#ifdef __cplusplus - extern "C" { -#endif - -/** @addtogroup STM32L1xx_System_Includes - * @{ - */ - -/** - * @} - */ - - -/** @addtogroup STM32L1xx_System_Exported_types - * @{ - */ - /* This variable is updated in three ways: - 1) by calling CMSIS function SystemCoreClockUpdate() - 2) by calling HAL API function HAL_RCC_GetSysClockFreq() - 3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency - Note: If you use this function to configure the system clock; then there - is no need to call the 2 first functions listed above, since SystemCoreClock - variable is updated automatically. - */ -extern uint32_t SystemCoreClock; /*!< System Clock Frequency (Core Clock) */ -/* -*/ -extern const uint8_t AHBPrescTable[16]; /*!< AHB prescalers table values */ -extern const uint8_t APBPrescTable[8]; /*!< APB prescalers table values */ -extern const uint8_t PLLMulTable[9]; /*!< PLL multipiers table values */ - -/** - * @} - */ - -/** @addtogroup STM32L1xx_System_Exported_Constants - * @{ - */ - -/** - * @} - */ - -/** @addtogroup STM32L1xx_System_Exported_Macros - * @{ - */ - -/** - * @} - */ - -/** @addtogroup STM32L1xx_System_Exported_Functions - * @{ - */ - -extern void SystemInit(void); -extern void SystemCoreClockUpdate(void); -extern void SetSysClock(void); - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif /*__SYSTEM_STM32L1XX_H */ - -/** - * @} - */ - -/** - * @} - */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/system_clock.c b/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/system_clock.c similarity index 85% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/system_clock.c rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/system_clock.c index de97e232fe..abbc47b4ce 100644 --- a/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/system_clock.c +++ b/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/system_clock.c @@ -32,12 +32,6 @@ #include "stm32l1xx.h" #include "mbed_error.h" -/*!< Uncomment the following line if you need to relocate your vector Table in - Internal SRAM. */ -/* #define VECT_TAB_SRAM */ -#define VECT_TAB_OFFSET 0x0 /*!< Vector Table base offset field. - This value must be a multiple of 0x200. */ - #define USE_PLL_HSE_EXTC 0x8 // Use external clock (ST Link MCO) #define USE_PLL_HSE_XTAL 0x4 // Use external xtal (X3 on board - not provided by default) #define USE_PLL_HSI 0x2 // Use HSI internal clock @@ -51,45 +45,6 @@ uint8_t SetSysClock_PLL_HSI(void); #endif /* ((CLOCK_SOURCE) & USE_PLL_HSI) */ -/** - * @brief Setup the microcontroller system. - * Initialize the Embedded Flash Interface, the PLL and update the - * SystemCoreClock variable. - * @param None - * @retval None - */ -void SystemInit (void) -{ - /*!< Set MSION bit */ - RCC->CR |= (uint32_t)0x00000100; - - /*!< Reset SW[1:0], HPRE[3:0], PPRE1[2:0], PPRE2[2:0], MCOSEL[2:0] and MCOPRE[2:0] bits */ - RCC->CFGR &= (uint32_t)0x88FFC00C; - - /*!< Reset HSION, HSEON, CSSON and PLLON bits */ - RCC->CR &= (uint32_t)0xEEFEFFFE; - - /*!< Reset HSEBYP bit */ - RCC->CR &= (uint32_t)0xFFFBFFFF; - - /*!< Reset PLLSRC, PLLMUL[3:0] and PLLDIV[1:0] bits */ - RCC->CFGR &= (uint32_t)0xFF02FFFF; - - /*!< Disable all interrupts */ - RCC->CIR = 0x00000000; - -#ifdef DATA_IN_ExtSRAM - SystemInit_ExtMemCtl(); -#endif /* DATA_IN_ExtSRAM */ - -#ifdef VECT_TAB_SRAM - SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */ -#else - SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */ -#endif - -} - /** * @brief Configures the System clock source, PLL Multiplier and Divider factors, * AHB/APBx prescalers and Flash settings diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/us_ticker_data.h b/targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/us_ticker_data.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/device/us_ticker_data.h rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_NUCLEO_L152RE/us_ticker_data.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/TOOLCHAIN_ARM/startup_stm32l151xc.S b/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/TOOLCHAIN_ARM/startup_stm32l151xc.S similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/TOOLCHAIN_ARM/startup_stm32l151xc.S rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/TOOLCHAIN_ARM/startup_stm32l151xc.S diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/TOOLCHAIN_ARM/stm32l151rc.sct b/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/TOOLCHAIN_ARM/stm32l151rc.sct similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/TOOLCHAIN_ARM/stm32l151rc.sct rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/TOOLCHAIN_ARM/stm32l151rc.sct diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/TOOLCHAIN_GCC_ARM/STM32L151XC.ld b/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/TOOLCHAIN_GCC_ARM/STM32L151XC.ld similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/TOOLCHAIN_GCC_ARM/STM32L151XC.ld rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/TOOLCHAIN_GCC_ARM/STM32L151XC.ld diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/TOOLCHAIN_GCC_ARM/startup_stm32l151xc.S b/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/TOOLCHAIN_GCC_ARM/startup_stm32l151xc.S similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/TOOLCHAIN_GCC_ARM/startup_stm32l151xc.S rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/TOOLCHAIN_GCC_ARM/startup_stm32l151xc.S diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/TOOLCHAIN_IAR/startup_stm32l152xc.S b/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/TOOLCHAIN_IAR/startup_stm32l152xc.S similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/TOOLCHAIN_IAR/startup_stm32l152xc.S rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/TOOLCHAIN_IAR/startup_stm32l152xc.S diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/TOOLCHAIN_IAR/stm32l152xc.icf b/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/TOOLCHAIN_IAR/stm32l152xc.icf similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/TOOLCHAIN_IAR/stm32l152xc.icf rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/TOOLCHAIN_IAR/stm32l152xc.icf diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/cmsis_nvic.h b/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/cmsis_nvic.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/cmsis_nvic.h rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/cmsis_nvic.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/stm32l1xx.h b/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/stm32l1xx.h deleted file mode 100644 index 5e6b85a7e7..0000000000 --- a/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/stm32l1xx.h +++ /dev/null @@ -1,261 +0,0 @@ -/** - ****************************************************************************** - * @file stm32l1xx.h - * @author MCD Application Team - * @brief CMSIS STM32L1xx Device Peripheral Access Layer Header File. - * - * The file is the unique include file that the application programmer - * is using in the C source code, usually in main.c. This file contains: - * - Configuration section that allows to select: - * - The STM32L1xx device used in the target application - * - To use or not the peripheral’s drivers in application code(i.e. - * code will be based on direct access to peripheral’s registers - * rather than drivers API), this option is controlled by - * "#define USE_HAL_DRIVER" - * - ****************************************************************************** - * @attention - * - *

© COPYRIGHT(c) 2017 STMicroelectronics

- * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************** - */ - -/** @addtogroup CMSIS - * @{ - */ - -/** @addtogroup stm32l1xx - * @{ - */ - -#ifndef __STM32L1XX_H -#define __STM32L1XX_H - -#ifdef __cplusplus - extern "C" { -#endif /* __cplusplus */ - -/** @addtogroup Library_configuration_section - * @{ - */ - -/** - * @brief STM32 Family - */ -#if !defined (STM32L1) -#define STM32L1 -#endif /* STM32L1 */ - -/* Uncomment the line below according to the target STM32L device used in your - application - */ - -#if !defined (STM32L100xB) && !defined (STM32L100xBA) && !defined (STM32L100xC) && \ - !defined (STM32L151xB) && !defined (STM32L151xBA) && !defined (STM32L151xC) && !defined (STM32L151xCA) && !defined (STM32L151xD) && !defined (STM32L151xDX) && !defined (STM32L151xE) && \ - !defined (STM32L152xB) && !defined (STM32L152xBA) && !defined (STM32L152xC) && !defined (STM32L152xCA) && !defined (STM32L152xD) && !defined (STM32L152xDX) && !defined (STM32L152xE) && \ - !defined (STM32L162xC) && !defined (STM32L162xCA) && !defined (STM32L162xD) && !defined (STM32L162xDX) && !defined (STM32L162xE) - /* #define STM32L100xB */ /*!< STM32L100C6, STM32L100R and STM32L100RB Devices */ - /* #define STM32L100xBA */ /*!< STM32L100C6-A, STM32L100R8-A and STM32L100RB-A Devices */ - /* #define STM32L100xC */ /*!< STM32L100RC Devices */ - /* #define STM32L151xB */ /*!< STM32L151C6, STM32L151R6, STM32L151C8, STM32L151R8, STM32L151V8, STM32L151CB, STM32L151RB and STM32L151VB */ - /* #define STM32L151xBA */ /*!< STM32L151C6-A, STM32L151R6-A, STM32L151C8-A, STM32L151R8-A, STM32L151V8-A, STM32L151CB-A, STM32L151RB-A and STM32L151VB-A */ - #define STM32L151xC /*!< STM32L151CC, STM32L151UC, STM32L151RC and STM32L151VC */ - /* #define STM32L151xCA */ /*!< STM32L151RC-A, STM32L151VC-A, STM32L151QC and STM32L151ZC */ - /* #define STM32L151xD */ /*!< STM32L151QD, STM32L151RD, STM32L151VD & STM32L151ZD */ - /* #define STM32L151xDX */ /*!< STM32L151VD-X Devices */ - /* #define STM32L151xE */ /*!< STM32L151QE, STM32L151RE, STM32L151VE and STM32L151ZE */ - /* #define STM32L152xB */ /*!< STM32L152C6, STM32L152R6, STM32L152C8, STM32L152R8, STM32L152V8, STM32L152CB, STM32L152RB and STM32L152VB */ - /* #define STM32L152xBA */ /*!< STM32L152C6-A, STM32L152R6-A, STM32L152C8-A, STM32L152R8-A, STM32L152V8-A, STM32L152CB-A, STM32L152RB-A and STM32L152VB-A */ - /* #define STM32L152xC */ /*!< STM32L152CC, STM32L152UC, STM32L152RC and STM32L152VC */ - /* #define STM32L152xCA */ /*!< STM32L152RC-A, STM32L152VC-A, STM32L152QC and STM32L152ZC */ - /* #define STM32L152xD */ /*!< STM32L152QD, STM32L152RD, STM32L152VD and STM32L152ZD */ - /* #define STM32L152xDX */ /*!< STM32L152VD-X Devices */ - /* #define STM32L152xE */ /*!< STM32L152QE, STM32L152RE, STM32L152VE and STM32L152ZE */ - /* #define STM32L162xC */ /*!< STM32L162RC and STM32L162VC */ - /* #define STM32L162xCA */ /*!< STM32L162RC-A, STM32L162VC-A, STM32L162QC and STM32L162ZC */ - /* #define STM32L162xD */ /*!< STM32L162QD, STM32L162RD, STM32L162VD and STM32L162ZD */ - /* #define STM32L162xDX */ /*!< STM32L162VD-X Devices */ - /* #define STM32L162xE */ /*!< STM32L162RE, STM32L162VE and STM32L162ZE */ -#endif - -/* Tip: To avoid modifying this file each time you need to switch between these - devices, you can define the device in your toolchain compiler preprocessor. - */ - -#if !defined (USE_HAL_DRIVER) -/** - * @brief Comment the line below if you will not use the peripherals drivers. - In this case, these drivers will not be included and the application code will - be based on direct access to peripherals registers - */ -#define USE_HAL_DRIVER -#endif /* USE_HAL_DRIVER */ - -/** - * @brief CMSIS Device version number - */ -#define __STM32L1xx_CMSIS_VERSION_MAIN (0x02) /*!< [31:24] main version */ -#define __STM32L1xx_CMSIS_VERSION_SUB1 (0x02) /*!< [23:16] sub1 version */ -#define __STM32L1xx_CMSIS_VERSION_SUB2 (0x03) /*!< [15:8] sub2 version */ -#define __STM32L1xx_CMSIS_VERSION_RC (0x00) /*!< [7:0] release candidate */ -#define __STM32L1xx_CMSIS_VERSION ((__STM32L1xx_CMSIS_VERSION_MAIN << 24)\ - |(__STM32L1xx_CMSIS_VERSION_SUB1 << 16)\ - |(__STM32L1xx_CMSIS_VERSION_SUB2 << 8 )\ - |(__STM32L1xx_CMSIS_VERSION_RC)) - -/** - * @} - */ - -/** @addtogroup Device_Included - * @{ - */ - -#if defined(STM32L100xB) - #include "stm32l100xb.h" -#elif defined(STM32L100xBA) - #include "stm32l100xba.h" -#elif defined(STM32L100xC) - #include "stm32l100xc.h" -#elif defined(STM32L151xB) - #include "stm32l151xb.h" -#elif defined(STM32L151xBA) - #include "stm32l151xba.h" -#elif defined(STM32L151xC) - #include "stm32l151xc.h" -#elif defined(STM32L151xCA) - #include "stm32l151xca.h" -#elif defined(STM32L151xD) - #include "stm32l151xd.h" -#elif defined(STM32L151xDX) - #include "stm32l151xdx.h" -#elif defined(STM32L151xE) - #include "stm32l151xe.h" -#elif defined(STM32L152xB) - #include "stm32l152xb.h" -#elif defined(STM32L152xBA) - #include "stm32l152xba.h" -#elif defined(STM32L152xC) - #include "stm32l152xc.h" -#elif defined(STM32L152xCA) - #include "stm32l152xca.h" -#elif defined(STM32L152xD) - #include "stm32l152xd.h" -#elif defined(STM32L152xDX) - #include "stm32l152xdx.h" -#elif defined(STM32L152xE) - #include "stm32l152xe.h" -#elif defined(STM32L162xC) - #include "stm32l162xc.h" -#elif defined(STM32L162xCA) - #include "stm32l162xca.h" -#elif defined(STM32L162xD) - #include "stm32l162xd.h" -#elif defined(STM32L162xDX) - #include "stm32l162xdx.h" -#elif defined(STM32L162xE) - #include "stm32l162xe.h" -#else - #error "Please select first the target STM32L1xx device used in your application (in stm32l1xx.h file)" -#endif - -/** - * @} - */ - -/** @addtogroup Exported_types - * @{ - */ -typedef enum -{ - RESET = 0, - SET = !RESET -} FlagStatus, ITStatus; - -typedef enum -{ - DISABLE = 0, - ENABLE = !DISABLE -} FunctionalState; -#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE)) - -typedef enum -{ - ERROR = 0, - SUCCESS = !ERROR -} ErrorStatus; - -/** - * @} - */ - - -/** @addtogroup Exported_macros - * @{ - */ -#define SET_BIT(REG, BIT) ((REG) |= (BIT)) - -#define CLEAR_BIT(REG, BIT) ((REG) &= ~(BIT)) - -#define READ_BIT(REG, BIT) ((REG) & (BIT)) - -#define CLEAR_REG(REG) ((REG) = (0x0)) - -#define WRITE_REG(REG, VAL) ((REG) = (VAL)) - -#define READ_REG(REG) ((REG)) - -#define MODIFY_REG(REG, CLEARMASK, SETMASK) WRITE_REG((REG), (((READ_REG(REG)) & (~(CLEARMASK))) | (SETMASK))) - -#define POSITION_VAL(VAL) (__CLZ(__RBIT(VAL))) - - -/** - * @} - */ - -#if defined (USE_HAL_DRIVER) - #include "stm32l1xx_hal.h" -#endif /* USE_HAL_DRIVER */ - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __STM32L1xx_H */ -/** - * @} - */ - -/** - * @} - */ - - - - -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/system_clock.c b/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/system_clock.c similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/system_clock.c rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/system_clock.c diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/us_ticker_data.h b/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/us_ticker_data.h similarity index 100% rename from targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/device/us_ticker_data.h rename to targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/us_ticker_data.h diff --git a/targets/TARGET_STM/TARGET_STM32L1/common_objects.h b/targets/TARGET_STM/TARGET_STM32L1/common_objects.h index 907cc041d4..3bef5240c8 100644 --- a/targets/TARGET_STM/TARGET_STM32L1/common_objects.h +++ b/targets/TARGET_STM/TARGET_STM32L1/common_objects.h @@ -37,6 +37,8 @@ #include "stm32l1xx_ll_usart.h" #include "stm32l1xx_ll_tim.h" #include "stm32l1xx_ll_pwr.h" +#include "stm32l1xx_ll_adc.h" +#include "stm32l1xx_ll_rtc.h" #ifdef __cplusplus extern "C" { diff --git a/targets/targets.json b/targets/targets.json index c10c9dd727..a64dcff03b 100644 --- a/targets/targets.json +++ b/targets/targets.json @@ -3405,10 +3405,19 @@ "MPU" ] }, - "XDOT_L151CC": { + "MCU_STM32L151xC": { "inherits": [ "MCU_STM32L1" ], + "public": false, + "macros_add": [ + "STM32L151xC" + ] + }, + "XDOT_L151CC": { + "inherits": [ + "MCU_STM32L151xC" + ], "extra_labels_add": [ "STM32L151CC" ], @@ -3434,10 +3443,19 @@ "8080" ] }, - "MOTE_L152RC": { + "MCU_STM32L152xC": { "inherits": [ "MCU_STM32L1" ], + "public": false, + "macros_add": [ + "STM32L152xC" + ] + }, + "MOTE_L152RC": { + "inherits": [ + "MCU_STM32L152xC" + ], "supported_form_factors": [ "ARDUINO" ], @@ -3452,17 +3470,23 @@ ], "device_name": "STM32L152RC" }, - "NUCLEO_L152RE": { + "MCU_STM32L152xE": { "inherits": [ "MCU_STM32L1" ], + "public": false, + "macros_add": [ + "STM32L152xE" + ] + }, + "NUCLEO_L152RE": { + "inherits": [ + "MCU_STM32L152xE" + ], "supported_form_factors": [ "ARDUINO", "MORPHO" ], - "extra_labels_add": [ - "STM32L152RE" - ], "detect_code": [ "0710" ],