Merge branch 'release/v11.0.0'

boards/nucleo_g431kb.json

@@ -5,8 +5,8 @@
     "extra_flags": "-DSTM32G4xx -DSTM32G431xx",
     "f_cpu": "170000000L",
     "mcu": "stm32g431kbt6",
-    "product_line": "STM32F407xx",
-    "variant": "STM32G431xx"
+    "product_line": "STM32G431xx",
+    "variant": "NUCLEO_G431KB"
   },
   "connectivity": [
     "can"

builder/frameworks/cmsis.py

@@ -109,7 +109,7 @@ def prepare_startup_file(src_path):
 
 env.Append(
     CPPPATH=[
-        os.path.join(CMSIS_DIR, "CMSIS", "Core", "Include"),
+        os.path.join(CMSIS_DIR, "CMSIS", "Include"),
         os.path.join(CMSIS_DEVICE_DIR, "Include")
     ],
 

examples/arduino-blink/platformio.ini

@@ -44,6 +44,12 @@ board = nucleo_h743zi
 [env:nucleo_g071rb]
 board = nucleo_g071rb
 
+[env:nucleo_g431kb]
+board = nucleo_g431kb
+
+[env:nucleo_g431rb]
+board = nucleo_g431rb
+
 [env:robotdyn_blackpill_f303cc]
 board = robotdyn_blackpill_f303cc
 

examples/mbed-legacy-examples/mbed-blink/platformio.ini

@@ -16,4 +16,3 @@ board = disco_f100rb
 platform = ststm32
 framework = mbed
 board = nucleo_l053r8
-

examples/mbed-legacy-examples/mbed-custom-target/platformio.ini

@@ -14,9 +14,9 @@ platform = ststm32
 framework = mbed
 board = custom_nucleo_l452re_mbed
 board_build.mbed.ldscript = $PROJECTSRC_DIR/TARGET_STM32L452xE/device/TOOLCHAIN_GCC_ARM/STM32L452XX.ld
-build_flags = 
+build_flags =
     -I$PROJECTSRC_DIR/TARGET_STM32L452xE
     -I$PROJECTSRC_DIR/TARGET_STM32L452xE/device
     -I$PROJECTSRC_DIR/TARGET_STM32L452xE/TARGET_NUCLEO_L452RE
 platform_packages =
-    framework-mbed @ ~6.51504.0
+    framework-mbed @ ~6.51506.0

examples/mbed-legacy-examples/mbed-events/platformio.ini

@@ -21,4 +21,4 @@ framework = mbed
 board = nucleo_f767zi
 build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT
 platform_packages =
-    framework-mbed @ ~6.51504.0
+    framework-mbed @ ~6.51506.0

examples/mbed-legacy-examples/mbed-filesystem/platformio.ini

@@ -13,4 +13,4 @@ framework = mbed
 board = nucleo_f767zi
 build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT
 platform_packages =
-    framework-mbed @ ~6.51504.0
+    framework-mbed @ ~6.51506.0

examples/mbed-legacy-examples/mbed-rtos-ethernet-tls/platformio.ini

@@ -13,4 +13,4 @@ framework = mbed
 board = nucleo_f767zi
 build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT
 platform_packages =
-    framework-mbed @ ~6.51504.0
+    framework-mbed @ ~6.51506.0

examples/mbed-legacy-examples/mbed-rtos-mesh-minimal/platformio.ini

@@ -13,4 +13,4 @@ framework = mbed
 board = nucleo_f411re
 build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT
 platform_packages =
-    framework-mbed @ ~6.51504.0
+    framework-mbed @ ~6.51506.0

examples/mbed-legacy-examples/mbed-rtos/platformio.ini

@@ -13,7 +13,7 @@ framework = mbed
 board = nucleo_f207zg
 build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT
 platform_packages =
-    framework-mbed @ ~6.51504.0
+    framework-mbed @ ~6.51506.0
 
 [env:disco_f303vc]
 platform = ststm32

examples/mbed-legacy-examples/mbed-serial/platformio.ini

@@ -10,4 +10,4 @@
 [env:nucleo_f030r8]
 platform = ststm32
 framework = mbed
-board = nucleo_f030r8
+board = nucleo_f030r8

examples/mbed-rtos-custom-target/platformio.ini

@@ -13,7 +13,7 @@
 platform = ststm32
 framework = mbed
 board = custom_nucleo_l452re_mbed
-board_build.mbed.ldscript = $PROJECTSRC_DIR/TARGET_STM32L452xE/device/TOOLCHAIN_GCC_ARM/STM32L452XX.ld
+board_build.mbed.ldscript = $PROJECTSRC_DIR/TARGET_STM32L452xE/TOOLCHAIN_GCC_ARM/stm32l452xe.ld
 build_flags = 
     -I$PROJECTSRC_DIR/TARGET_STM32L452xE
     -I$PROJECTSRC_DIR/TARGET_STM32L452xE/device

examples/mbed-rtos-custom-target/src/TARGET_STM32L452xE/CMakeLists.txt

@@ -0,0 +1,27 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+if("NUCLEO_L452RE_P" IN_LIST MBED_TARGET_LABELS)
+    add_subdirectory(TARGET_NUCLEO_L452RE_P)
+endif()
+
+if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
+    set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32l452xx.S)
+    set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32l452xe.ld)
+elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
+    set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32l452xx.S)
+    set(LINKER_FILE TOOLCHAIN_ARM/stm32l452xe.sct)
+endif()
+
+set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+
+target_sources(mbed-core
+    INTERFACE
+        system_clock.c
+        ${STARTUP_FILE}
+)
+
+target_include_directories(mbed-core
+    INTERFACE
+        .
+)

examples/mbed-rtos-custom-target/src/TARGET_STM32L452xE/TARGET_NUCLEO_L452RE_P/CMakeLists.txt

@@ -0,0 +1,12 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+target_sources(mbed-core
+    INTERFACE
+        PeripheralPins.c
+)
+
+target_include_directories(mbed-core
+    INTERFACE
+        .
+)

examples/mbed-rtos-custom-target/src/TARGET_STM32L452xE/device/TOOLCHAIN_GCC_ARM/startup_stm32l452xx.S → examples/mbed-rtos-custom-target/src/TARGET_STM32L452xE/TOOLCHAIN_GCC_ARM/startup_stm32l452xx.S

@@ -18,10 +18,10 @@
   * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
-  * This software component is licensed by ST under BSD 3-Clause license,
+  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/BSD-3-Clause
+  *                        opensource.org/licenses/Apache-2.0
   *
   ******************************************************************************
   */
@@ -60,7 +60,10 @@ defined in linker script */
 	.weak	Reset_Handler
 	.type	Reset_Handler, %function
 Reset_Handler:
-  ldr   sp, =_estack    /* Atollic update: set stack pointer */
+  ldr   sp, =_estack    /* Set stack pointer */
+
+/* Call the clock system initialization function.*/
+    bl  SystemInit
 
 /* Copy the data segment initializers from flash to SRAM */
   movs	r1, #0
@@ -90,21 +93,12 @@ LoopFillZerobss:
 	cmp	r2, r3
 	bcc	FillZerobss
 
-/* Call the clock system intitialization function.*/
-    bl  SystemInit
-/* Call static constructors */
-  //bl __libc_init_array
-/* Call the application's entry point.*/
-  //bl  main
-  // Calling the crt0 'cold-start' entry point. There __libc_init_array is called
-  // and when existing hardware_init_hook() and software_init_hook() before
-  // starting main(). software_init_hook() is available and has to be called due
-  // to initializsation when using rtos.
-  bl _start
+	bl _start
+	bx lr
 
 LoopForever:
     b LoopForever
-
+    
 .size	Reset_Handler, .-Reset_Handler
 
 /**

examples/mbed-rtos-custom-target/src/TARGET_STM32L452xE/device/TOOLCHAIN_GCC_ARM/STM32L452XX.ld → examples/mbed-rtos-custom-target/src/TARGET_STM32L452xE/TOOLCHAIN_GCC_ARM/stm32l452xe.ld

@@ -28,10 +28,10 @@
 
 M_CRASH_DATA_RAM_SIZE = 0x100;
 
-#if !defined(MBED_BOOT_STACK_SIZE)
+#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 */
-    #define MBED_BOOT_STACK_SIZE  0x400
+    #define MBED_CONF_TARGET_BOOT_STACK_SIZE  0x400
 #endif
 
 /* Round up VECTORS_SIZE to 8 bytes */
@@ -137,7 +137,7 @@ SECTIONS
     {
         __StackLimit = .;
         *(.stack*);
-        . += MBED_BOOT_STACK_SIZE - (. - __StackLimit);
+        . += MBED_CONF_TARGET_BOOT_STACK_SIZE - (. - __StackLimit);
     } > SRAM2
 
     /* Set stack top to end of RAM, and stack limit move down by