ARMmbed · theotherjimmy · Aug 21, 2017 · Aug 7, 2017 · Aug 7, 2017 · Aug 7, 2017
diff --git a/..._STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/TOOLCHAIN_ARM_MICRO/startup_stm32l053xx.S b/..._STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/TOOLCHAIN_ARM_MICRO/startup_stm32l053xx.S
diff --git a/...TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/TOOLCHAIN_ARM_MICRO/stm32l053r8.sct b/...TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/TOOLCHAIN_ARM_MICRO/stm32l053r8.sct
diff --git a/...ET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/TOOLCHAIN_ARM_STD/startup_stm32l053xx.S b/...ET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/TOOLCHAIN_ARM_STD/startup_stm32l053xx.S
diff --git a/...s/TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/TOOLCHAIN_ARM_STD/stm32l053r8.sct b/...s/TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/TOOLCHAIN_ARM_STD/stm32l053r8.sct
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/TOOLCHAIN_ARM_STD/sys.cpp b/targets/TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/TOOLCHAIN_ARM_STD/sys.cpp
diff --git a/...ts/TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/TOOLCHAIN_GCC_ARM/STM32L053X8.ld b/...ts/TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/TOOLCHAIN_GCC_ARM/STM32L053X8.ld
diff --git a/...ET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/TOOLCHAIN_GCC_ARM/startup_stm32l053xx.S b/...ET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/TOOLCHAIN_GCC_ARM/startup_stm32l053xx.S
diff --git a/...TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/TOOLCHAIN_IAR/startup_stm32l053xx.S b/...TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/TOOLCHAIN_IAR/startup_stm32l053xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/TOOLCHAIN_IAR/stm32l053xx.icf b/targets/TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/TOOLCHAIN_IAR/stm32l053xx.icf
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/cmsis.h b/targets/TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/cmsis.h
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/cmsis_nvic.h b/targets/TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/cmsis_nvic.h
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/hal_tick.h b/targets/TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/hal_tick.h
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/stm32l053xx.h b/targets/TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/stm32l053xx.h
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/stm32l0xx.h b/targets/TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/stm32l0xx.h
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/system_stm32l0xx.h b/targets/TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/device/system_stm32l0xx.h
diff --git a/targets/TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/objects.h b/targets/TARGET_STM/TARGET_STM32L0/TARGET_NUCLEO_L053R8/objects.h
diff --git a/...2L0/TARGET_DISCO_L053C8/PeripheralNames.h → ...3x8/TARGET_DISCO_L053C8/PeripheralNames.h b/...2L0/TARGET_DISCO_L053C8/PeripheralNames.h → ...3x8/TARGET_DISCO_L053C8/PeripheralNames.h
diff --git a/...32L0/TARGET_DISCO_L053C8/PeripheralPins.c → ...53x8/TARGET_DISCO_L053C8/PeripheralPins.c b/...32L0/TARGET_DISCO_L053C8/PeripheralPins.c → ...53x8/TARGET_DISCO_L053C8/PeripheralPins.c
diff --git a/...ET_STM32L0/TARGET_DISCO_L053C8/PinNames.h → ...TM32L053x8/TARGET_DISCO_L053C8/PinNames.h b/...ET_STM32L0/TARGET_DISCO_L053C8/PinNames.h → ...TM32L053x8/TARGET_DISCO_L053C8/PinNames.h
diff --git a/...TARGET_DISCO_L053C8/device/system_clock.c → ...L053x8/TARGET_DISCO_L053C8/system_clock.c b/...TARGET_DISCO_L053C8/device/system_clock.c → ...L053x8/TARGET_DISCO_L053C8/system_clock.c
diff --git a/...L0/TARGET_NUCLEO_L053R8/PeripheralNames.h → ...x8/TARGET_NUCLEO_L053R8/PeripheralNames.h b/...L0/TARGET_NUCLEO_L053R8/PeripheralNames.h → ...x8/TARGET_NUCLEO_L053R8/PeripheralNames.h
diff --git a/...2L0/TARGET_NUCLEO_L053R8/PeripheralPins.c → ...3x8/TARGET_NUCLEO_L053R8/PeripheralPins.c b/...2L0/TARGET_NUCLEO_L053R8/PeripheralPins.c → ...3x8/TARGET_NUCLEO_L053R8/PeripheralPins.c
diff --git a/...T_STM32L0/TARGET_NUCLEO_L053R8/PinNames.h → ...M32L053x8/TARGET_NUCLEO_L053R8/PinNames.h b/...T_STM32L0/TARGET_NUCLEO_L053R8/PinNames.h → ...M32L053x8/TARGET_NUCLEO_L053R8/PinNames.h
diff --git a/...ARGET_NUCLEO_L053R8/device/system_clock.c → ...053x8/TARGET_NUCLEO_L053R8/system_clock.c b/...ARGET_NUCLEO_L053R8/device/system_clock.c → ...053x8/TARGET_NUCLEO_L053R8/system_clock.c
@@ -132,7 +132,6 @@ uint8_t SetSysClock_PLL_HSE(uint8_t bypass)
 {
     RCC_ClkInitTypeDef RCC_ClkInitStruct;
     RCC_OscInitTypeDef RCC_OscInitStruct;
-    RCC_PeriphCLKInitTypeDef RCC_PeriphClkInit;
 
     /* Used to gain time after DeepSleep in case HSI is used */
     if (__HAL_RCC_GET_FLAG(RCC_FLAG_HSIRDY) != RESET) {
@@ -163,6 +162,14 @@ uint8_t SetSysClock_PLL_HSE(uint8_t bypass)
         return 0; // FAIL
     }
 
+    /* Select HSI48 as USB clock source */
+    RCC_PeriphCLKInitTypeDef  PeriphClkInitStruct;
+    PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USB;
+    PeriphClkInitStruct.UsbClockSelection = RCC_USBCLKSOURCE_HSI48;
+    if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) {
+        return 0; // FAIL
+    }
+
     /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2 clocks dividers */
     RCC_ClkInitStruct.ClockType      = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2);
     RCC_ClkInitStruct.SYSCLKSource   = RCC_SYSCLKSOURCE_PLLCLK; // 32 MHz
@@ -173,12 +180,6 @@ uint8_t SetSysClock_PLL_HSE(uint8_t bypass)
         return 0; // FAIL
     }
 
-    RCC_PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USB;
-    RCC_PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_HSI48;
-    if (HAL_RCCEx_PeriphCLKConfig(&RCC_PeriphClkInit) != HAL_OK) {
-        return 0; // FAIL
-    }
-
     /* Output clock on MCO1 pin(PA8) for debugging purpose */
     //if (bypass == 0)
     //  HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_HSE, RCC_MCODIV_2); // 4 MHz

diff --git a/...TOOLCHAIN_ARM_MICRO/startup_stm32l053xx.S → ...TOOLCHAIN_ARM_MICRO/startup_stm32l053xx.S b/...TOOLCHAIN_ARM_MICRO/startup_stm32l053xx.S → ...TOOLCHAIN_ARM_MICRO/startup_stm32l053xx.S
@@ -128,7 +128,7 @@ __Vectors       DCD     __initial_sp              ; Top of Stack
                 DCD     RNG_LPUART1_IRQHandler         ; RNG and LPUART1
                 DCD     LCD_IRQHandler                 ; LCD
                 DCD     USB_IRQHandler                 ; USB
-                
+
 __Vectors_End
 
 __Vectors_Size  EQU  __Vectors_End - __Vectors
@@ -139,7 +139,7 @@ __Vectors_Size  EQU  __Vectors_End - __Vectors
 Reset_Handler    PROC
                  EXPORT  Reset_Handler                 [WEAK]
         IMPORT  __main
-        IMPORT  SystemInit  
+        IMPORT  SystemInit
                  LDR     R0, =SystemInit
                  BLX     R0
                  LDR     R0, =__main
@@ -213,7 +213,7 @@ TSC_IRQHandler
 DMA1_Channel1_IRQHandler
 DMA1_Channel2_3_IRQHandler
 DMA1_Channel4_5_6_7_IRQHandler
-ADC1_COMP_IRQHandler 
+ADC1_COMP_IRQHandler
 LPTIM1_IRQHandler
 TIM2_IRQHandler
 TIM6_DAC_IRQHandler

diff --git a/...evice/TOOLCHAIN_ARM_MICRO/stm32l053c8.sct → ...evice/TOOLCHAIN_ARM_MICRO/stm32l053x8.sct b/...evice/TOOLCHAIN_ARM_MICRO/stm32l053c8.sct → ...evice/TOOLCHAIN_ARM_MICRO/stm32l053x8.sct
@@ -27,7 +27,7 @@
 ; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-; STM32L053C8: 64KB FLASH (0x10000) + 8KB RAM (0x2000)
+; 64KB FLASH (0x10000) + 8KB RAM (0x2000)
 LR_IROM1 0x08000000 0x10000  {    ; load region size_region
 
   ER_IROM1 0x08000000 0x10000  {  ; load address = execution address

diff --git a/...e/TOOLCHAIN_ARM_STD/startup_stm32l053xx.S → ...e/TOOLCHAIN_ARM_STD/startup_stm32l053xx.S b/...e/TOOLCHAIN_ARM_STD/startup_stm32l053xx.S → ...e/TOOLCHAIN_ARM_STD/startup_stm32l053xx.S
diff --git a/.../device/TOOLCHAIN_ARM_STD/stm32l053c8.sct → .../device/TOOLCHAIN_ARM_STD/stm32l053x8.sct b/.../device/TOOLCHAIN_ARM_STD/stm32l053c8.sct → .../device/TOOLCHAIN_ARM_STD/stm32l053x8.sct
@@ -27,7 +27,7 @@
 ; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-; STM32L053C8: 64KB FLASH (0x10000) + 8KB RAM (0x2000)
+; 64KB FLASH (0x10000) + 8KB RAM (0x2000)
 LR_IROM1 0x08000000 0x10000  {    ; load region size_region
 
   ER_IROM1 0x08000000 0x10000  {  ; load address = execution address

diff --git a/...O_L053C8/device/TOOLCHAIN_ARM_STD/sys.cpp → ...32L053x8/device/TOOLCHAIN_ARM_STD/sys.cpp b/...O_L053C8/device/TOOLCHAIN_ARM_STD/sys.cpp → ...32L053x8/device/TOOLCHAIN_ARM_STD/sys.cpp
diff --git a/...8/device/TOOLCHAIN_GCC_ARM/STM32L053X8.ld → ...8/device/TOOLCHAIN_GCC_ARM/STM32L053X8.ld b/...8/device/TOOLCHAIN_GCC_ARM/STM32L053X8.ld → ...8/device/TOOLCHAIN_GCC_ARM/STM32L053X8.ld
diff --git a/...e/TOOLCHAIN_GCC_ARM/startup_stm32l053xx.S → ...e/TOOLCHAIN_GCC_ARM/startup_stm32l053xx.S b/...e/TOOLCHAIN_GCC_ARM/startup_stm32l053xx.S → ...e/TOOLCHAIN_GCC_ARM/startup_stm32l053xx.S
diff --git a/...evice/TOOLCHAIN_IAR/startup_stm32l053xx.S → ...evice/TOOLCHAIN_IAR/startup_stm32l053xx.S b/...evice/TOOLCHAIN_IAR/startup_stm32l053xx.S → ...evice/TOOLCHAIN_IAR/startup_stm32l053xx.S
diff --git a/...53C8/device/TOOLCHAIN_IAR/stm32l053xx.icf → ...53x8/device/TOOLCHAIN_IAR/stm32l053xx.icf b/...53C8/device/TOOLCHAIN_IAR/stm32l053xx.icf → ...53x8/device/TOOLCHAIN_IAR/stm32l053xx.icf
diff --git a/...TM32L0/TARGET_DISCO_L053C8/device/cmsis.h → ...STM32L0/TARGET_STM32L053x8/device/cmsis.h b/...TM32L0/TARGET_DISCO_L053C8/device/cmsis.h → ...STM32L0/TARGET_STM32L053x8/device/cmsis.h
diff --git a/...0/TARGET_DISCO_L053C8/device/cmsis_nvic.h → ...L0/TARGET_STM32L053x8/device/cmsis_nvic.h b/...0/TARGET_DISCO_L053C8/device/cmsis_nvic.h → ...L0/TARGET_STM32L053x8/device/cmsis_nvic.h
diff --git a/...2L0/TARGET_DISCO_L053C8/device/hal_tick.h → ...32L0/TARGET_STM32L053x8/device/hal_tick.h b/...2L0/TARGET_DISCO_L053C8/device/hal_tick.h → ...32L0/TARGET_STM32L053x8/device/hal_tick.h
diff --git a/.../TARGET_DISCO_L053C8/device/stm32l053xx.h → ...0/TARGET_STM32L053x8/device/stm32l053xx.h b/.../TARGET_DISCO_L053C8/device/stm32l053xx.h → ...0/TARGET_STM32L053x8/device/stm32l053xx.h
diff --git a/...L0/TARGET_DISCO_L053C8/device/stm32l0xx.h → ...2L0/TARGET_STM32L053x8/device/stm32l0xx.h b/...L0/TARGET_DISCO_L053C8/device/stm32l0xx.h → ...2L0/TARGET_STM32L053x8/device/stm32l0xx.h
diff --git a/...ET_DISCO_L053C8/device/system_stm32l0xx.h → ...GET_STM32L053x8/device/system_stm32l0xx.h b/...ET_DISCO_L053C8/device/system_stm32l0xx.h → ...GET_STM32L053x8/device/system_stm32l0xx.h
diff --git a/...GET_STM32L0/TARGET_DISCO_L053C8/objects.h → ...RGET_STM32L0/TARGET_STM32L053x8/objects.h b/...GET_STM32L0/TARGET_DISCO_L053C8/objects.h → ...RGET_STM32L0/TARGET_STM32L053x8/objects.h
diff --git a/targets/targets.json b/targets/targets.json
@@ -1279,7 +1279,7 @@
         "inherits": ["FAMILY_STM32"],
         "supported_form_factors": ["ARDUINO", "MORPHO"],
         "core": "Cortex-M0+",
-        "extra_labels_add": ["STM32L0", "STM32L053R8"],
+        "extra_labels_add": ["STM32L0", "STM32L053x8", "STM32L053R8"],
         "config": {
             "clock_source": {
                 "help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL (need HW patch) | USE_PLL_HSI",
@@ -1493,7 +1493,7 @@
     "DISCO_L053C8": {
         "inherits": ["FAMILY_STM32"],
         "core": "Cortex-M0+",
-        "extra_labels_add": ["STM32L0", "STM32L053C8"],
+        "extra_labels_add": ["STM32L0", "STM32L053x8", "STM32L053C8"],
         "macros": ["RTC_LSI=1"],
         "config": {
             "clock_source": {