diff --git a/targets/TARGET_STM/TARGET_STM32G4/TARGET_STM32G474xE/TARGET_NUCLEO_G474RE/PeripheralNames.h b/targets/TARGET_STM/TARGET_STM32G4/PeripheralNames.h
similarity index 60%
rename from targets/TARGET_STM/TARGET_STM32G4/TARGET_STM32G474xE/TARGET_NUCLEO_G474RE/PeripheralNames.h
rename to targets/TARGET_STM/TARGET_STM32G4/PeripheralNames.h
index 4835811164..348507996b 100644
--- a/targets/TARGET_STM/TARGET_STM32G4/TARGET_STM32G474xE/TARGET_NUCLEO_G474RE/PeripheralNames.h
+++ b/targets/TARGET_STM/TARGET_STM32G4/PeripheralNames.h
@@ -1,19 +1,18 @@
 /* mbed Microcontroller Library
- * Copyright (c) 2016 ARM Limited
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: BSD-3-Clause
+ ******************************************************************************
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Copyright (c) 2015-2020 STMicroelectronics.
+ * All rights reserved.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ ******************************************************************************
  */
+
 #ifndef MBED_PERIPHERALNAMES_H
 #define MBED_PERIPHERALNAMES_H
 
@@ -26,17 +25,26 @@ extern "C" {
 typedef enum {
     ADC_1 = (int)ADC1_BASE,
     ADC_2 = (int)ADC2_BASE,
+#if defined ADC3_BASE
     ADC_3 = (int)ADC3_BASE,
+#endif
+#if defined ADC4_BASE
     ADC_4 = (int)ADC4_BASE,
-    ADC_5 = (int)ADC5_BASE
+#endif
+#if defined ADC5_BASE
+    ADC_5 = (int)ADC5_BASE,
+#endif
 } ADCName;
 
 typedef enum {
     DAC_1 = (int)DAC1_BASE,
+#if defined DAC2_BASE
     DAC_2 = (int)DAC2_BASE,
+#endif
     DAC_3 = (int)DAC3_BASE,
+#if defined DAC4_BASE
     DAC_4 = (int)DAC4_BASE,
-
+#endif
 } DACName;
 
 typedef enum {
@@ -44,7 +52,9 @@ typedef enum {
     UART_2   = (int)USART2_BASE,
     UART_3   = (int)USART3_BASE,
     UART_4   = (int)UART4_BASE,
+#if defined UART5_BASE
     UART_5   = (int)UART5_BASE,
+#endif
     LPUART_1 = (int)LPUART1_BASE
 } UARTName;
 
@@ -53,14 +63,18 @@ typedef enum {
     SPI_1 = (int)SPI1_BASE,
     SPI_2 = (int)SPI2_BASE,
     SPI_3 = (int)SPI3_BASE,
+#if defined SPI4_BASE
     SPI_4 = (int)SPI4_BASE,
+#endif
 } SPIName;
 
 typedef enum {
     I2C_1 = (int)I2C1_BASE,
     I2C_2 = (int)I2C2_BASE,
     I2C_3 = (int)I2C3_BASE,
+#if defined I2C4_BASE
     I2C_4 = (int)I2C4_BASE
+#endif
 } I2CName;
 
 typedef enum {
@@ -68,25 +82,35 @@ typedef enum {
     PWM_2  = (int)TIM2_BASE,
     PWM_3  = (int)TIM3_BASE,
     PWM_4  = (int)TIM4_BASE,
+#if defined TIM5_BASE
     PWM_5  = (int)TIM5_BASE,
+#endif
     PWM_6  = (int)TIM6_BASE,
     PWM_7  = (int)TIM7_BASE,
     PWM_8  = (int)TIM8_BASE,
     PWM_15 = (int)TIM15_BASE,
     PWM_16 = (int)TIM16_BASE,
     PWM_17 = (int)TIM17_BASE,
-    PWM_20 = (int)TIM20_BASE
+#if defined TIM20_BASE
+    PWM_20 = (int)TIM20_BASE,
+#endif
 } PWMName;
 
 typedef enum {
     CAN_1 = (int)FDCAN1_BASE,
+#if defined FDCAN2_BASE
     CAN_2 = (int)FDCAN2_BASE,
-    CAN_3 = (int)FDCAN3_BASE
+#endif
+#if defined FDCAN3_BASE
+    CAN_3 = (int)FDCAN3_BASE,
+#endif
 } CANName;
 
+#if defined QSPI_R_BASE
 typedef enum {
     QSPI_1 = (int)QSPI_R_BASE,
 } QSPIName;
+#endif
 
 typedef enum {
     USB_FS = (int)USB_BASE
diff --git a/targets/TARGET_STM/TARGET_STM32G4/TARGET_STM32G474xE/TARGET_NUCLEO_G474RE/system_clock.c b/targets/TARGET_STM/TARGET_STM32G4/TARGET_STM32G474xE/system_clock.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G4/TARGET_STM32G474xE/TARGET_NUCLEO_G474RE/system_clock.c
rename to targets/TARGET_STM/TARGET_STM32G4/TARGET_STM32G474xE/system_clock.c
diff --git a/targets/TARGET_STM/TARGET_STM32G4/analogin_device.c b/targets/TARGET_STM/TARGET_STM32G4/analogin_device.c
index f8f1fab36e..2b887b7c9c 100644
--- a/targets/TARGET_STM/TARGET_STM32G4/analogin_device.c
+++ b/targets/TARGET_STM/TARGET_STM32G4/analogin_device.c
@@ -1,30 +1,18 @@
 /* mbed Microcontroller Library
- * Copyright (c) 2016, STMicroelectronics
+ * SPDX-License-Identifier: BSD-3-Clause
+ ******************************************************************************
+ *
+ * Copyright (c) 2015-2020 STMicroelectronics.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
  *
- * 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.
+ ******************************************************************************
  */
+
 #include "mbed_assert.h"
 #include "analogin_api.h"
 
@@ -313,12 +301,11 @@ void analogin_free(analogin_t *obj)
 #if defined(ADC1)
     if ((ADCName)obj->handle.Instance == ADC_1) {
         adc1_en_counter--;
-        if(ADC1_EN_CTR == 0)
-        {
+        if (ADC1_EN_CTR == 0) {
             HAL_ADC_DeInit(&obj->handle);
 
             // Disable clock if ADC2 is also unused
-            if(ADC2_EN_CTR == 0) {
+            if (ADC2_EN_CTR == 0) {
                 LL_AHB2_GRP1_DisableClock(LL_AHB2_GRP1_PERIPH_ADC12);
             }
         }
@@ -327,12 +314,11 @@ void analogin_free(analogin_t *obj)
 #if defined(ADC2)
     if ((ADCName)obj->handle.Instance == ADC_2) {
         adc2_en_counter--;
-        if(ADC2_EN_CTR == 0)
-        {
+        if (ADC2_EN_CTR == 0) {
             HAL_ADC_DeInit(&obj->handle);
 
             // Disable clock if ADC1 is also unused
-            if(ADC1_EN_CTR == 0) {
+            if (ADC1_EN_CTR == 0) {
                 LL_AHB2_GRP1_DisableClock(LL_AHB2_GRP1_PERIPH_ADC12);
             }
         }
@@ -341,12 +327,11 @@ void analogin_free(analogin_t *obj)
 #if defined(ADC3)
     if ((ADCName)obj->handle.Instance == ADC_3) {
         adc3_en_counter--;
-        if(ADC3_EN_CTR == 0)
-        {
+        if (ADC3_EN_CTR == 0) {
             HAL_ADC_DeInit(&obj->handle);
 
             // Disable clock if ADC4 and ADC5 are also unused
-            if((ADC4_EN_CTR + ADC5_EN_CTR) == 0) {
+            if ((ADC4_EN_CTR + ADC5_EN_CTR) == 0) {
                 LL_AHB2_GRP1_DisableClock(LL_AHB2_GRP1_PERIPH_ADC345);
             }
         }
@@ -355,12 +340,11 @@ void analogin_free(analogin_t *obj)
 #if defined(ADC4)
     if ((ADCName)obj->handle.Instance == ADC_4) {
         adc4_en_counter--;
-        if(ADC4_EN_CTR == 0)
-        {
+        if (ADC4_EN_CTR == 0) {
             HAL_ADC_DeInit(&obj->handle);
 
             // Disable clock if ADC3 and ADC5 are also unused
-            if((ADC3_EN_CTR + ADC5_EN_CTR) == 0) {
+            if ((ADC3_EN_CTR + ADC5_EN_CTR) == 0) {
                 LL_AHB2_GRP1_DisableClock(LL_AHB2_GRP1_PERIPH_ADC345);
             }
         }
@@ -370,12 +354,11 @@ void analogin_free(analogin_t *obj)
 #if defined(ADC5)
     if ((ADCName)obj->handle.Instance == ADC_5) {
         adc5_en_counter--;
-        if(ADC5_EN_CTR == 0)
-        {
+        if (ADC5_EN_CTR == 0) {
             HAL_ADC_DeInit(&obj->handle);
 
             // Disable clock if ADC3 and ADC4 are also unused
-            if((ADC3_EN_CTR + ADC4_EN_CTR) == 0) {
+            if ((ADC3_EN_CTR + ADC4_EN_CTR) == 0) {
                 LL_AHB2_GRP1_DisableClock(LL_AHB2_GRP1_PERIPH_ADC345);
             }
         }
diff --git a/targets/TARGET_STM/TARGET_STM32G4/analogout_device.c b/targets/TARGET_STM/TARGET_STM32G4/analogout_device.c
index 7ee22c2caa..46efa9a25f 100644
--- a/targets/TARGET_STM/TARGET_STM32G4/analogout_device.c
+++ b/targets/TARGET_STM/TARGET_STM32G4/analogout_device.c
@@ -1,30 +1,18 @@
 /* mbed Microcontroller Library
- * Copyright (c) 2015, STMicroelectronics
+ * SPDX-License-Identifier: BSD-3-Clause
+ ******************************************************************************
+ *
+ * Copyright (c) 2015-2020 STMicroelectronics.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
  *
- * 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.
+ ******************************************************************************
  */
+
 #include "mbed_assert.h"
 #include "analogout_api.h"
 
diff --git a/targets/TARGET_STM/TARGET_STM32G4/cmsis.h b/targets/TARGET_STM/TARGET_STM32G4/cmsis.h
index 1e97949ba4..aaa02fc80d 100644
--- a/targets/TARGET_STM/TARGET_STM32G4/cmsis.h
+++ b/targets/TARGET_STM/TARGET_STM32G4/cmsis.h
@@ -1,18 +1,16 @@
 /* mbed Microcontroller Library
- * Copyright (c) 2019 ARM Limited
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: BSD-3-Clause
+ ******************************************************************************
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Copyright (c) 2015-2020 STMicroelectronics.
+ * All rights reserved.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ ******************************************************************************
  */
 
 #ifndef MBED_CMSIS_H
diff --git a/targets/TARGET_STM/TARGET_STM32G4/flash_api.c b/targets/TARGET_STM/TARGET_STM32G4/flash_api.c
index 826e15e696..4b12ce0b9c 100644
--- a/targets/TARGET_STM/TARGET_STM32G4/flash_api.c
+++ b/targets/TARGET_STM/TARGET_STM32G4/flash_api.c
@@ -1,19 +1,16 @@
 /* mbed Microcontroller Library
- * Copyright (c) 2017 ARM Limited
- * Copyright (c) 2017 STMicroelectronics
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: BSD-3-Clause
+ ******************************************************************************
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Copyright (c) 2015-2020 STMicroelectronics.
+ * All rights reserved.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ ******************************************************************************
  */
 
 #include "flash_api.h"
@@ -51,7 +48,7 @@ static uint32_t GetPage(uint32_t Addr)
 static uint32_t GetBank(uint32_t Addr)
 {
     uint32_t bank = 0;
-#if defined(SYSCFG_MEMRMP_FB_MODE)
+#if defined(SYSCFG_MEMRMP_FB_MODE) && defined(FLASH_OPTR_DBANK)
     if (READ_BIT(SYSCFG->MEMRMP, SYSCFG_MEMRMP_FB_MODE) == 0) {
         /* No Bank swap */
         if (Addr < (FLASH_BASE + FLASH_BANK_SIZE)) {
@@ -68,7 +65,6 @@ static uint32_t GetBank(uint32_t Addr)
         }
     }
 #else
-    /* Device like L432KC */
     bank = FLASH_BANK_1;
 #endif
 
diff --git a/targets/TARGET_STM/TARGET_STM32G4/gpio_irq_device.c b/targets/TARGET_STM/TARGET_STM32G4/gpio_irq_device.c
index e18dfba047..e082e06e72 100644
--- a/targets/TARGET_STM/TARGET_STM32G4/gpio_irq_device.c
+++ b/targets/TARGET_STM/TARGET_STM32G4/gpio_irq_device.c
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  ******************************************************************************
  *
- * Copyright (c) 2017 STMicroelectronics.
+ * Copyright (c) 2015-2020 STMicroelectronics.
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,6 +12,7 @@
  *
  ******************************************************************************
  */
+
 #include "cmsis.h"
 #include "gpio_irq_device.h"
 
diff --git a/targets/TARGET_STM/TARGET_STM32G4/gpio_irq_device.h b/targets/TARGET_STM/TARGET_STM32G4/gpio_irq_device.h
index cf99296891..556fcd57e1 100644
--- a/targets/TARGET_STM/TARGET_STM32G4/gpio_irq_device.h
+++ b/targets/TARGET_STM/TARGET_STM32G4/gpio_irq_device.h
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  ******************************************************************************
  *
- * Copyright (c) 2017 STMicroelectronics.
+ * Copyright (c) 2015-2020 STMicroelectronics.
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,6 +12,7 @@
  *
  ******************************************************************************
  */
+
 #ifndef MBED_GPIO_IRQ_DEVICE_H
 #define MBED_GPIO_IRQ_DEVICE_H
 
diff --git a/targets/TARGET_STM/TARGET_STM32G4/i2c_device.h b/targets/TARGET_STM/TARGET_STM32G4/i2c_device.h
index 087d9e43a3..35f5c320e1 100644
--- a/targets/TARGET_STM/TARGET_STM32G4/i2c_device.h
+++ b/targets/TARGET_STM/TARGET_STM32G4/i2c_device.h
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  ******************************************************************************
  *
- * Copyright (c) 2015 STMicroelectronics.
+ * Copyright (c) 2015-2020 STMicroelectronics.
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -12,6 +12,7 @@
  *
  ******************************************************************************
  */
+
 #ifndef MBED_I2C_DEVICE_H
 #define MBED_I2C_DEVICE_H
 
diff --git a/targets/TARGET_STM/TARGET_STM32G4/objects.h b/targets/TARGET_STM/TARGET_STM32G4/objects.h
index 5c7f62db29..5ca363a00c 100644
--- a/targets/TARGET_STM/TARGET_STM32G4/objects.h
+++ b/targets/TARGET_STM/TARGET_STM32G4/objects.h
@@ -1,19 +1,18 @@
 /* mbed Microcontroller Library
- * Copyright (c) 2017 ARM Limited
- * SPDX-License-Identifier: Apache-2.0
+ * SPDX-License-Identifier: BSD-3-Clause
+ ******************************************************************************
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Copyright (c) 2015-2020 STMicroelectronics.
+ * All rights reserved.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ ******************************************************************************
  */
+
 #ifndef MBED_OBJECTS_H
 #define MBED_OBJECTS_H
 
diff --git a/targets/TARGET_STM/TARGET_STM32G4/pin_device.h b/targets/TARGET_STM/TARGET_STM32G4/pin_device.h
index ca16058f5d..da826c9ff3 100644
--- a/targets/TARGET_STM/TARGET_STM32G4/pin_device.h
+++ b/targets/TARGET_STM/TARGET_STM32G4/pin_device.h
@@ -12,6 +12,7 @@
  *
  ******************************************************************************
  */
+
 #ifndef MBED_PIN_DEVICE_H
 #define MBED_PIN_DEVICE_H
 
diff --git a/targets/TARGET_STM/TARGET_STM32G4/pwmout_device.c b/targets/TARGET_STM/TARGET_STM32G4/pwmout_device.c
index cea9afaf06..c831071a48 100644
--- a/targets/TARGET_STM/TARGET_STM32G4/pwmout_device.c
+++ b/targets/TARGET_STM/TARGET_STM32G4/pwmout_device.c
@@ -1,32 +1,18 @@
 /* mbed Microcontroller Library
- *******************************************************************************
- * Copyright (c) 2017, STMicroelectronics
+ * SPDX-License-Identifier: BSD-3-Clause
+ ******************************************************************************
+ *
+ * Copyright (c) 2015-2020 STMicroelectronics.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
  *
- * 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.
- *******************************************************************************
+ ******************************************************************************
  */
+
 #include "cmsis.h"
 #include "pwmout_api.h"
 #include "pwmout_device.h"
diff --git a/targets/TARGET_STM/TARGET_STM32G4/pwmout_device.h b/targets/TARGET_STM/TARGET_STM32G4/pwmout_device.h
index bc6f761f18..f12945df76 100644
--- a/targets/TARGET_STM/TARGET_STM32G4/pwmout_device.h
+++ b/targets/TARGET_STM/TARGET_STM32G4/pwmout_device.h
@@ -1,32 +1,18 @@
 /* mbed Microcontroller Library
- *******************************************************************************
- * Copyright (c) 2017, STMicroelectronics
+ * SPDX-License-Identifier: BSD-3-Clause
+ ******************************************************************************
+ *
+ * Copyright (c) 2015-2020 STMicroelectronics.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
  *
- * 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.
- *******************************************************************************
+ ******************************************************************************
  */
+
 #ifndef MBED_PWMOUT_DEVICE_H
 #define MBED_PWMOUT_DEVICE_H
 
diff --git a/targets/TARGET_STM/TARGET_STM32G4/serial_device.c b/targets/TARGET_STM/TARGET_STM32G4/serial_device.c
index 6cd8638751..7f4e06ec4a 100644
--- a/targets/TARGET_STM/TARGET_STM32G4/serial_device.c
+++ b/targets/TARGET_STM/TARGET_STM32G4/serial_device.c
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  ******************************************************************************
  *
- * Copyright (c) 2017 STMicroelectronics.
+ * Copyright (c) 2015-2020 STMicroelectronics.
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
diff --git a/targets/TARGET_STM/TARGET_STM32G4/spi_api.c b/targets/TARGET_STM/TARGET_STM32G4/spi_api.c
index b714ba9bde..63af2042eb 100644
--- a/targets/TARGET_STM/TARGET_STM32G4/spi_api.c
+++ b/targets/TARGET_STM/TARGET_STM32G4/spi_api.c
@@ -1,32 +1,18 @@
 /* mbed Microcontroller Library
- *******************************************************************************
- * Copyright (c) 2020, STMicroelectronics
+ * SPDX-License-Identifier: BSD-3-Clause
+ ******************************************************************************
+ *
+ * Copyright (c) 2015-2020 STMicroelectronics.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
  *
- * 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.
- *******************************************************************************
+ ******************************************************************************
  */
+
 #include "mbed_assert.h"
 #include "mbed_error.h"
 #include "spi_api.h"
diff --git a/targets/TARGET_STM/TARGET_STM32G4/spi_device.h b/targets/TARGET_STM/TARGET_STM32G4/spi_device.h
index c8b7567a03..6eef23df0a 100644
--- a/targets/TARGET_STM/TARGET_STM32G4/spi_device.h
+++ b/targets/TARGET_STM/TARGET_STM32G4/spi_device.h
@@ -1,32 +1,18 @@
 /* mbed Microcontroller Library
- *******************************************************************************
- * Copyright (c) 2017, STMicroelectronics
+ * SPDX-License-Identifier: BSD-3-Clause
+ ******************************************************************************
+ *
+ * Copyright (c) 2015-2020 STMicroelectronics.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
  *
- * 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.
- *******************************************************************************
+ ******************************************************************************
  */
+
 #ifndef MBED_SPI_DEVICE_H
 #define MBED_SPI_DEVICE_H
 
diff --git a/targets/TARGET_STM/TARGET_STM32G4/us_ticker_data.h b/targets/TARGET_STM/TARGET_STM32G4/us_ticker_data.h
index 928d55ee27..1dba0fcbf5 100644
--- a/targets/TARGET_STM/TARGET_STM32G4/us_ticker_data.h
+++ b/targets/TARGET_STM/TARGET_STM32G4/us_ticker_data.h
@@ -2,27 +2,30 @@
  * SPDX-License-Identifier: BSD-3-Clause
  ******************************************************************************
  *
- * Copyright (c) 2017 STMicroelectronics. 
+ * Copyright (c) 2015-2020 STMicroelectronics.
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the 
+ * the "License"; You may not use this file except in compliance with the
  * License. You may obtain a copy of the License at:
  *                        opensource.org/licenses/BSD-3-Clause
  *
  ******************************************************************************
  */
+
 #ifndef __US_TICKER_DATA_H
 #define __US_TICKER_DATA_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 #include "stm32g4xx.h"
 #include "stm32g4xx_ll_tim.h"
 #include "cmsis_nvic.h"
-   
+
+#if defined TIM5_BASE
+
 #define TIM_MST      TIM5
 #define TIM_MST_IRQ  TIM5_IRQn
 #define TIM_MST_RCC  __TIM5_CLK_ENABLE()
@@ -31,6 +34,18 @@
 #define TIM_MST_RESET_ON   __TIM5_FORCE_RESET()
 #define TIM_MST_RESET_OFF  __TIM5_RELEASE_RESET()
 
+#else
+
+#define TIM_MST      TIM2
+#define TIM_MST_IRQ  TIM2_IRQn
+#define TIM_MST_RCC  __TIM2_CLK_ENABLE()
+#define TIM_MST_DBGMCU_FREEZE  __HAL_DBGMCU_FREEZE_TIM2()
+
+#define TIM_MST_RESET_ON   __TIM2_FORCE_RESET()
+#define TIM_MST_RESET_OFF  __TIM2_RELEASE_RESET()
+
+#endif
+
 #define TIM_MST_BIT_WIDTH  32 // 16 or 32
 
 #define TIM_MST_PCLK  1 // Select the peripheral clock number (1 or 2)