Merge pull request #15230 from jeromecoutant/PR_G4

STM32G4: corrections for STM32G491xE, STM32G4A1xE and STM32G471xE

Author: 0xc0170

targets/TARGET_STM/TARGET_STM32G4/CMakeLists.txt

@@ -8,6 +8,8 @@ add_subdirectory(TARGET_STM32G473xE EXCLUDE_FROM_ALL)
 add_subdirectory(TARGET_STM32G474xE EXCLUDE_FROM_ALL)
 add_subdirectory(TARGET_STM32G483xE EXCLUDE_FROM_ALL)
 add_subdirectory(TARGET_STM32G484xE EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_STM32G491xE EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_STM32G4A1xE EXCLUDE_FROM_ALL)
 add_subdirectory(STM32Cube_FW EXCLUDE_FROM_ALL)
 
 add_library(mbed-stm32g4 INTERFACE)

targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/CMSIS/stm32g471xx.h

@@ -0,0 +1,26 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
+    set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32g491xx.S)
+    set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32g491xe.ld)
+elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
+    set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32g491xx.S)
+    set(LINKER_FILE TOOLCHAIN_ARM/stm32g491xe.sct)
+endif()
+
+add_library(mbed-stm32g491xe INTERFACE)
+
+target_include_directories(mbed-stm32g491xe
+    INTERFACE
+        .
+)
+
+target_sources(mbed-stm32g491xe
+    INTERFACE
+        ${STARTUP_FILE}
+)
+
+mbed_set_linker_script(mbed-stm32g491xe ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+
+target_link_libraries(mbed-stm32g491xe INTERFACE mbed-stm32g4)

targets/TARGET_STM/TARGET_STM32G4/TARGET_STM32G491xE/CMakeLists.txt

@@ -0,0 +1,57 @@
+#! armclang -E --target=arm-arm-none-eabi -x c -mcpu=cortex-m4
+; Scatter-Loading Description File
+;
+; SPDX-License-Identifier: BSD-3-Clause
+;******************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2016-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
+;* License. You may obtain a copy of the License at:
+;*                        opensource.org/licenses/BSD-3-Clause
+;*
+;******************************************************************************
+
+#include "../cmsis_nvic.h"
+
+#if !defined(MBED_APP_START)
+  #define MBED_APP_START  MBED_ROM_START
+#endif
+
+#if !defined(MBED_APP_SIZE)
+  #define MBED_APP_SIZE  MBED_ROM_SIZE
+#endif
+
+#if !defined(MBED_CONF_TARGET_BOOT_STACK_SIZE)
+/* 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 */
+#define VECTORS_SIZE  (((NVIC_NUM_VECTORS * 4) + 7) AND ~7)
+
+LR_IROM1  MBED_APP_START  MBED_APP_SIZE  {
+
+  ER_IROM1  MBED_APP_START  MBED_APP_SIZE  {
+    *.o (RESET, +First)
+    *(InRoot$$Sections)
+    .ANY (+RO)
+  }
+
+  RW_IRAM1  (MBED_RAM_START + VECTORS_SIZE)  {  ; RW data
+    .ANY (+RW +ZI)
+  }
+
+  ARM_LIB_HEAP  AlignExpr(+0, 16)  EMPTY  (MBED_RAM_START + MBED_RAM_SIZE - MBED_CONF_TARGET_BOOT_STACK_SIZE - AlignExpr(ImageLimit(RW_IRAM1), 16))  { ; Heap growing up
+  }
+
+  ARM_LIB_STACK  (MBED_RAM_START + MBED_RAM_SIZE)  EMPTY  -MBED_CONF_TARGET_BOOT_STACK_SIZE  { ; Stack region growing down
+  }
+}