STM32L1 : directory restructuring

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 */
 
 /**

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);
-
 /**
   * @}
   */

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
+)

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
   * @{
   */

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 <stdio.h>
 
 /* 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 */

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);
       }

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
   * @{