STM32G0: align code with CubeUpdate script

ARMmbed · 0xc0170 · Sep 28, 2021 · Sep 14, 2021 · Sep 14, 2021 · Sep 14, 2021
commit e0877e4077bd04d50f8638a700eadac73cdac0d8
diff --git a/targets/TARGET_STM/TARGET_STM32G0/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32G0/CMakeLists.txt
@@ -1,16 +1,21 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_subdirectory(TARGET_STM32G030xx EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_STM32G031xx EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_STM32G041xx EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_STM32G070xx EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_STM32G071xx EXCLUDE_FROM_ALL)
-add_subdirectory(TARGET_STM32G081xx EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_STM32G030x8 EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_STM32G031x8 EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_STM32G041x8 EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_STM32G070xB EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_STM32G071xB EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_STM32G081xB EXCLUDE_FROM_ALL)
 add_subdirectory(STM32Cube_FW EXCLUDE_FROM_ALL)
 
 add_library(mbed-stm32g0 INTERFACE)
 
+target_include_directories(mbed-stm32g0
+    INTERFACE
+        .
+)
+
 target_sources(mbed-stm32g0
     INTERFACE
         analogin_device.c
@@ -23,9 +28,4 @@ target_sources(mbed-stm32g0
         spi_api.c
 )
 
-target_include_directories(mbed-stm32g0
-    INTERFACE
-        .
-)
-
 target_link_libraries(mbed-stm32g0 INTERFACE mbed-stm mbed-stm32g0cube-fw)
diff --git a/...xx/TARGET_NUCLEO_G071RB/PeripheralNames.h → ...RGET_STM/TARGET_STM32G0/PeripheralNames.h b/...xx/TARGET_NUCLEO_G071RB/PeripheralNames.h → ...RGET_STM/TARGET_STM32G0/PeripheralNames.h
@@ -25,15 +25,21 @@ typedef enum {
     ADC_1 = (int)ADC1_BASE
 } ADCName;
 
+#if defined DAC_BASE
 typedef enum {
     DAC_1 = (int)DAC_BASE
 } DACName;
+#endif
 
 typedef enum {
     UART_1   = (int)USART1_BASE,
     UART_2   = (int)USART2_BASE,
+#if defined USART3_BASE
     UART_3   = (int)USART3_BASE,
+#endif
+#if defined USART4_BASE
     UART_4   = (int)USART4_BASE,
+#endif
     LPUART_1 = (int)LPUART1_BASE
 } UARTName;
 
@@ -53,7 +59,9 @@ typedef enum {
     PWM_2  = (int)TIM2_BASE,
     PWM_3  = (int)TIM3_BASE,
     PWM_14 = (int)TIM14_BASE,
+#if defined TIM15_BASE
     PWM_15 = (int)TIM15_BASE,
+#endif
     PWM_16 = (int)TIM16_BASE,
     PWM_17 = (int)TIM17_BASE
 } PWMName;

diff --git a/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/stm32g0xx_hal_conf.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/stm32g0xx_hal_conf.h
@@ -73,83 +73,63 @@ extern "C" {
 #if !defined  (USE_HAL_ADC_REGISTER_CALLBACKS)
 #define USE_HAL_ADC_REGISTER_CALLBACKS        0u
 #endif
-
 #if !defined  (USE_HAL_CEC_REGISTER_CALLBACKS)
 #define USE_HAL_CEC_REGISTER_CALLBACKS        0u
 #endif
-
 #if !defined  (USE_HAL_COMP_REGISTER_CALLBACKS)
 #define USE_HAL_COMP_REGISTER_CALLBACKS       0u
 #endif
-
 #if !defined  (USE_HAL_CRYP_REGISTER_CALLBACKS)
 #define USE_HAL_CRYP_REGISTER_CALLBACKS       0u
 #endif
-
 #if !defined  (USE_HAL_DAC_REGISTER_CALLBACKS)
 #define USE_HAL_DAC_REGISTER_CALLBACKS        0u
 #endif
-
 #if !defined  (USE_HAL_FDCAN_REGISTER_CALLBACKS)
 #define USE_HAL_FDCAN_REGISTER_CALLBACKS      0u
 #endif
-
 #if !defined  (USE_HAL_I2C_REGISTER_CALLBACKS)
 #define USE_HAL_I2C_REGISTER_CALLBACKS        0u
 #endif
-
 #if !defined  (USE_HAL_I2S_REGISTER_CALLBACKS)
 #define USE_HAL_I2S_REGISTER_CALLBACKS        0u
 #endif
-
 #if !defined  (USE_HAL_IRDA_REGISTER_CALLBACKS)
 #define USE_HAL_IRDA_REGISTER_CALLBACKS       0u
 #endif
-
 #if !defined  (USE_HAL_LPTIM_REGISTER_CALLBACKS)
 #define USE_HAL_LPTIM_REGISTER_CALLBACKS      0u
 #endif
-
 #if !defined  (USE_HAL_HCD_REGISTER_CALLBACKS)
 #define USE_HAL_HCD_REGISTER_CALLBACKS        0u
 #endif
-
 #if !defined  (USE_HAL_PCD_REGISTER_CALLBACKS)
 #define USE_HAL_PCD_REGISTER_CALLBACKS        0u
 #endif
-
 #if !defined  (USE_HAL_RNG_REGISTER_CALLBACKS)
 #define USE_HAL_RNG_REGISTER_CALLBACKS        0u
 #endif
-
 #if !defined  (USE_HAL_RTC_REGISTER_CALLBACKS)
 #define USE_HAL_RTC_REGISTER_CALLBACKS        0u
 #endif
-
 #if !defined  (USE_HAL_SMARTCARD_REGISTER_CALLBACKS)
 #define USE_HAL_SMARTCARD_REGISTER_CALLBACKS  0u
 #endif
-
 #if !defined  (USE_HAL_SMBUS_REGISTER_CALLBACKS)
 #define USE_HAL_SMBUS_REGISTER_CALLBACKS      0u
 #endif
-
 #if !defined  (USE_HAL_SPI_REGISTER_CALLBACKS)
 #define USE_HAL_SPI_REGISTER_CALLBACKS        0u
 #endif
-
 #if !defined  (USE_HAL_TIM_REGISTER_CALLBACKS)
 #define USE_HAL_TIM_REGISTER_CALLBACKS        0u
 #endif
-
 #if !defined  (USE_HAL_UART_REGISTER_CALLBACKS)
 #define USE_HAL_UART_REGISTER_CALLBACKS       0u
 #endif
-
 #if !defined  (USE_HAL_USART_REGISTER_CALLBACKS)
 #define USE_HAL_USART_REGISTER_CALLBACKS      0u
 #endif
-
 #if !defined  (USE_HAL_WWDG_REGISTER_CALLBACKS)
 #define USE_HAL_WWDG_REGISTER_CALLBACKS       0u
 #endif
@@ -259,6 +239,7 @@ in voltage and temperature.*/
 #define USE_HAL_CRYP_SUSPEND_RESUME     1U
 #endif
 
+
 /* ########################## Assert Selection ############################## */
 /**
   * @brief Uncomment the line below to expanse the "assert_param" macro in the
@@ -394,17 +375,7 @@ in voltage and temperature.*/
 
 /* Exported macro ------------------------------------------------------------*/
 #ifdef  USE_FULL_ASSERT
-/**
-  * @brief  The assert_param macro is used for functions 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" // MBED patch
 #else
 #define assert_param(expr) ((void)0U)
 #endif /* USE_FULL_ASSERT */

diff --git a/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/system_stm32g0xx.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/system_stm32g0xx.c
@@ -166,15 +166,10 @@
   * @param  None
   * @retval None
   */
-void SystemInit(void)
+__WEAK void SystemInit(void)
 {
-  /* Configure the Vector Table location add offset address ------------------*/
-#ifdef VECT_TAB_SRAM
-  SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM */
-#else
 #include "nvic_addr.h"                   // MBED
   SCB->VTOR = NVIC_FLASH_VECTOR_ADDRESS; // MBED
-#endif
 }
 
 /**

diff --git a/...STM32G0/TARGET_STM32G030xx/CMakeLists.txt → ...STM32G0/TARGET_STM32G030x8/CMakeLists.txt b/...STM32G0/TARGET_STM32G030xx/CMakeLists.txt → ...STM32G0/TARGET_STM32G030x8/CMakeLists.txt
@@ -3,24 +3,24 @@
 
 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32g030xx.S)
-    set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32g030xx.ld)
+    set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32g030x8.ld)
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32g030xx.S)
-    set(LINKER_FILE TOOLCHAIN_ARM/stm32g030xx.sct)
+    set(LINKER_FILE TOOLCHAIN_ARM/stm32g030x8.sct)
 endif()
 
-add_library(mbed-stm32g030xx INTERFACE)
+add_library(mbed-stm32g030x8 INTERFACE)
 
-target_sources(mbed-stm32g030xx
+target_include_directories(mbed-stm32g030x8
     INTERFACE
-        ${STARTUP_FILE}
+        .
 )
 
-target_include_directories(mbed-stm32g030xx
+target_sources(mbed-stm32g030x8
     INTERFACE
-        .
+        ${STARTUP_FILE}
 )
 
-mbed_set_linker_script(mbed-stm32g030xx ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+mbed_set_linker_script(mbed-stm32g030x8 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
 
-target_link_libraries(mbed-stm32g030xx INTERFACE mbed-stm32g0)
+target_link_libraries(mbed-stm32g030x8 INTERFACE mbed-stm32g0)
diff --git a/...030xx/TOOLCHAIN_ARM/startup_stm32g030xx.S → ...030x8/TOOLCHAIN_ARM/startup_stm32g030xx.S b/...030xx/TOOLCHAIN_ARM/startup_stm32g030xx.S → ...030x8/TOOLCHAIN_ARM/startup_stm32g030xx.S
diff --git a/...STM32G031xx/TOOLCHAIN_ARM/stm32g031xx.sct → ...STM32G030x8/TOOLCHAIN_ARM/stm32g030x8.sct b/...STM32G031xx/TOOLCHAIN_ARM/stm32g031xx.sct → ...STM32G030x8/TOOLCHAIN_ARM/stm32g030x8.sct
@@ -25,13 +25,13 @@
   #define MBED_APP_SIZE  MBED_ROM_SIZE
 #endif
 
-/* This value is normally defined by the tools to 0x1000 for bare metal and 0x400 for RTOS */
 #if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE)
-#  if defined(MBED_BOOT_STACK_SIZE)
-#    define MBED_CONF_TARGET_BOOT_STACK_SIZE MBED_BOOT_STACK_SIZE
-#  else
-#    define MBED_CONF_TARGET_BOOT_STACK_SIZE 0x400
-#  endif
+/* This value is normally defined by the tools to 0x1000 for bare metal and 0x400 for RTOS */
+#if defined(MBED_BOOT_STACK_SIZE)
+#define MBED_CONF_TARGET_BOOT_STACK_SIZE MBED_BOOT_STACK_SIZE
+#else
+#define MBED_CONF_TARGET_BOOT_STACK_SIZE 0x400
+#endif
 #endif
 
 /* Round up VECTORS_SIZE to 8 bytes */

diff --git a/...x/TOOLCHAIN_GCC_ARM/startup_stm32g030xx.S → ...8/TOOLCHAIN_GCC_ARM/startup_stm32g030xx.S b/...x/TOOLCHAIN_GCC_ARM/startup_stm32g030xx.S → ...8/TOOLCHAIN_GCC_ARM/startup_stm32g030xx.S
diff --git a/...32G030xx/TOOLCHAIN_GCC_ARM/stm32g030xx.ld → ...32G030x8/TOOLCHAIN_GCC_ARM/stm32g030x8.ld b/...32G030xx/TOOLCHAIN_GCC_ARM/stm32g030xx.ld → ...32G030x8/TOOLCHAIN_GCC_ARM/stm32g030x8.ld
diff --git a/...030xx/TOOLCHAIN_IAR/startup_stm32g030xx.S → ...030x8/TOOLCHAIN_IAR/startup_stm32g030xx.S b/...030xx/TOOLCHAIN_IAR/startup_stm32g030xx.S → ...030x8/TOOLCHAIN_IAR/startup_stm32g030xx.S
diff --git a/...STM32G041xx/TOOLCHAIN_IAR/stm32g041xx.icf → ...STM32G030x8/TOOLCHAIN_IAR/stm32g030x8.icf b/...STM32G041xx/TOOLCHAIN_IAR/stm32g041xx.icf → ...STM32G030x8/TOOLCHAIN_IAR/stm32g030x8.icf
@@ -32,7 +32,7 @@ if (!isdefinedsymbol(MBED_APP_SIZE)) {
 }
 
 if (!isdefinedsymbol(MBED_CONF_TARGET_BOOT_STACK_SIZE)) {
-    /* This value is normally defined by the tools 
+    /* This value is normally defined by the tools
         to 0x1000 for bare metal and 0x400 for RTOS */
     define symbol MBED_CONF_TARGET_BOOT_STACK_SIZE = 0x400;
 }

diff --git a/...T_STM32G0/TARGET_STM32G031xx/cmsis_nvic.h → ...T_STM32G0/TARGET_STM32G030x8/cmsis_nvic.h b/...T_STM32G0/TARGET_STM32G031xx/cmsis_nvic.h → ...T_STM32G0/TARGET_STM32G030x8/cmsis_nvic.h
@@ -22,11 +22,7 @@
 #endif
 
 #if !defined(MBED_ROM_SIZE)
-#if defined (TARGET_NUCLEO_G031K8)
 #define MBED_ROM_SIZE  0x10000  // 64 KB
-#else
-#error "MBED_ROM_SIZE not defined"
-#endif
 #endif
 
 #if !defined(MBED_RAM_START)

diff --git a/...STM32G0/TARGET_STM32G031xx/CMakeLists.txt → ...STM32G0/TARGET_STM32G031x8/CMakeLists.txt b/...STM32G0/TARGET_STM32G031xx/CMakeLists.txt → ...STM32G0/TARGET_STM32G031x8/CMakeLists.txt
@@ -5,24 +5,25 @@ add_subdirectory(TARGET_NUCLEO_G031K8 EXCLUDE_FROM_ALL)
 
 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32g031xx.S)
-    set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32g031xx.ld)
+    set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32g031x8.ld)
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32g031xx.S)
-    set(LINKER_FILE TOOLCHAIN_ARM/stm32g031xx.sct)
+    set(LINKER_FILE TOOLCHAIN_ARM/stm32g031x8.sct)
 endif()
 
-add_library(mbed-stm32g031xx INTERFACE)
+add_library(mbed-stm32g031x8 INTERFACE)
 
-target_sources(mbed-stm32g031xx
+target_include_directories(mbed-stm32g031x8
     INTERFACE
-        ${STARTUP_FILE}
+        .
 )
 
-target_include_directories(mbed-stm32g031xx
+target_sources(mbed-stm32g031x8
     INTERFACE
-        .
+        ${STARTUP_FILE}
+        system_clock.c
 )
 
-mbed_set_linker_script(mbed-stm32g031xx ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+mbed_set_linker_script(mbed-stm32g031x8 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
 
-target_link_libraries(mbed-stm32g031xx INTERFACE mbed-stm32g0)
+target_link_libraries(mbed-stm32g031x8 INTERFACE mbed-stm32g0)
diff --git a/...031xx/TARGET_NUCLEO_G031K8/CMakeLists.txt → ...031x8/TARGET_NUCLEO_G031K8/CMakeLists.txt b/...031xx/TARGET_NUCLEO_G031K8/CMakeLists.txt → ...031x8/TARGET_NUCLEO_G031K8/CMakeLists.txt
@@ -6,12 +6,11 @@ add_library(mbed-nucleo-g031k8 INTERFACE)
 target_sources(mbed-nucleo-g031k8
     INTERFACE
         PeripheralPins.c
-        system_clock.c
 )
 
 target_include_directories(mbed-nucleo-g031k8
     INTERFACE
         .
 )
 
-target_link_libraries(mbed-nucleo-g031k8 INTERFACE mbed-stm32g031xx)
+target_link_libraries(mbed-nucleo-g031k8 INTERFACE mbed-stm32g031x8)
diff --git a/...1xx/TARGET_NUCLEO_G031K8/PeripheralPins.c → ...1x8/TARGET_NUCLEO_G031K8/PeripheralPins.c b/...1xx/TARGET_NUCLEO_G031K8/PeripheralPins.c → ...1x8/TARGET_NUCLEO_G031K8/PeripheralPins.c
diff --git a/...M32G031xx/TARGET_NUCLEO_G031K8/PinNames.h → ...M32G031x8/TARGET_NUCLEO_G031K8/PinNames.h b/...M32G031xx/TARGET_NUCLEO_G031K8/PinNames.h → ...M32G031x8/TARGET_NUCLEO_G031K8/PinNames.h
diff --git a/...031xx/TOOLCHAIN_ARM/startup_stm32g031xx.S → ...031x8/TOOLCHAIN_ARM/startup_stm32g031xx.S b/...031xx/TOOLCHAIN_ARM/startup_stm32g031xx.S → ...031x8/TOOLCHAIN_ARM/startup_stm32g031xx.S
diff --git a/...STM32G030xx/TOOLCHAIN_ARM/stm32g030xx.sct → ...STM32G031x8/TOOLCHAIN_ARM/stm32g031x8.sct b/...STM32G030xx/TOOLCHAIN_ARM/stm32g030xx.sct → ...STM32G031x8/TOOLCHAIN_ARM/stm32g031x8.sct
@@ -25,13 +25,13 @@
   #define MBED_APP_SIZE  MBED_ROM_SIZE
 #endif
 
-/* This value is normally defined by the tools to 0x1000 for bare metal and 0x400 for RTOS */
 #if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE)
-#  if defined(MBED_BOOT_STACK_SIZE)
-#    define MBED_CONF_TARGET_BOOT_STACK_SIZE MBED_BOOT_STACK_SIZE
-#  else
-#    define MBED_CONF_TARGET_BOOT_STACK_SIZE 0x400
-#  endif
+/* This value is normally defined by the tools to 0x1000 for bare metal and 0x400 for RTOS */
+#if defined(MBED_BOOT_STACK_SIZE)
+#define MBED_CONF_TARGET_BOOT_STACK_SIZE MBED_BOOT_STACK_SIZE
+#else
+#define MBED_CONF_TARGET_BOOT_STACK_SIZE 0x400
+#endif
 #endif
 
 /* Round up VECTORS_SIZE to 8 bytes */

diff --git a/...x/TOOLCHAIN_GCC_ARM/startup_stm32g031xx.S → ...8/TOOLCHAIN_GCC_ARM/startup_stm32g031xx.S b/...x/TOOLCHAIN_GCC_ARM/startup_stm32g031xx.S → ...8/TOOLCHAIN_GCC_ARM/startup_stm32g031xx.S
diff --git a/...32G031xx/TOOLCHAIN_GCC_ARM/stm32g031xx.ld → ...32G031x8/TOOLCHAIN_GCC_ARM/stm32g031x8.ld b/...32G031xx/TOOLCHAIN_GCC_ARM/stm32g031xx.ld → ...32G031x8/TOOLCHAIN_GCC_ARM/stm32g031x8.ld
diff --git a/...031xx/TOOLCHAIN_IAR/startup_stm32g031xx.S → ...031x8/TOOLCHAIN_IAR/startup_stm32g031xx.S b/...031xx/TOOLCHAIN_IAR/startup_stm32g031xx.S → ...031x8/TOOLCHAIN_IAR/startup_stm32g031xx.S
diff --git a/...STM32G031xx/TOOLCHAIN_IAR/stm32g031xx.icf → ...STM32G031x8/TOOLCHAIN_IAR/stm32g031x8.icf b/...STM32G031xx/TOOLCHAIN_IAR/stm32g031xx.icf → ...STM32G031x8/TOOLCHAIN_IAR/stm32g031x8.icf
@@ -18,7 +18,7 @@
 
 /* Tools provide -DMBED_ROM_START=xxx -DMBED_ROM_SIZE=xxx -DMBED_RAM_START=xxx -DMBED_RAM_SIZE=xxx */
 
-define symbol VECTORS     = 46; /* This value must match NVIC_NUM_VECTORS in cmsis_nvic.h */
+define symbol VECTORS     = 48; /* This value must match NVIC_NUM_VECTORS in cmsis_nvic.h */
 define symbol HEAP_SIZE   = 0x1000;
 
 /* Common - Do not change */
@@ -32,7 +32,7 @@ if (!isdefinedsymbol(MBED_APP_SIZE)) {
 }
 
 if (!isdefinedsymbol(MBED_CONF_TARGET_BOOT_STACK_SIZE)) {
-    /* This value is normally defined by the tools 
+    /* This value is normally defined by the tools
         to 0x1000 for bare metal and 0x400 for RTOS */
     define symbol MBED_CONF_TARGET_BOOT_STACK_SIZE = 0x400;
 }

diff --git a/...T_STM32G0/TARGET_STM32G081xx/cmsis_nvic.h → ...T_STM32G0/TARGET_STM32G031x8/cmsis_nvic.h b/...T_STM32G0/TARGET_STM32G081xx/cmsis_nvic.h → ...T_STM32G0/TARGET_STM32G031x8/cmsis_nvic.h
@@ -22,15 +22,15 @@
 #endif
 
 #if !defined(MBED_ROM_SIZE)
-#define MBED_ROM_SIZE  0x20000
+#define MBED_ROM_SIZE  0x10000  // 64 KB
 #endif
 
 #if !defined(MBED_RAM_START)
 #define MBED_RAM_START  0x20000000
 #endif
 
 #if !defined(MBED_RAM_SIZE)
-#define MBED_RAM_SIZE  0x9000
+#define MBED_RAM_SIZE  0x2000  // 8 KB
 #endif
 
 #define NVIC_NUM_VECTORS        48