From 753cf994b6d529da9c8dd710a24a96b0388425ee Mon Sep 17 00:00:00 2001
From: Mathias Rasmussen <mathiasvr@gmail.com>
Date: Wed, 2 Dec 2020 06:51:04 +0100
Subject: [PATCH] Update to STM32 v10, optimize build (#20325)

---
 platformio.ini | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 52310e6b8..b26ece402 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -722,7 +722,7 @@ board    = nxp_lpc1769
 # HAL/STM32 Base Environment values
 #
 [common_stm32]
-platform      = ststm32@~8.0
+platform      = ststm32@~10.0
 build_flags   = ${common.build_flags}
   -std=gnu++14
   -DUSBCON -DUSBD_USE_CDC
@@ -734,14 +734,17 @@ src_filter    = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/shared/b
 # HAL/STM32F1 Common Environment values
 #
 [common_stm32f1]
-platform      = ststm32@~6.1
-build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
+platform          = ststm32@~10.0
+board_build.core  = maple
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags}
-build_unflags = -std=gnu11 -std=gnu++11
-src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
-lib_ignore    = SPI
-lib_deps      = ${common.lib_deps}
+  -DARDUINO_ARCH_STM32
+build_unflags     = -std=gnu11 -std=gnu++11
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
+lib_ignore        = SPI, FreeRTOS701, FreeRTOS821
+lib_deps          = ${common.lib_deps}
   SoftwareSerialM
+platform_packages = tool-stm32duino
 
 #
 # STM32F103RC
@@ -750,7 +753,6 @@ lib_deps      = ${common.lib_deps}
 platform          = ${common_stm32f1.platform}
 extends           = common_stm32f1
 board             = genericSTM32F103RC
-platform_packages = tool-stm32duino
 monitor_speed     = 115200
 
 #
@@ -760,7 +762,6 @@ monitor_speed     = 115200
 platform          = ${common_stm32f1.platform}
 extends           = common_stm32f1
 board             = MEEB_3DP
-platform_packages = tool-stm32duino
 build_flags       = ${common_stm32f1.build_flags}
                     -DDEBUG_LEVEL=0
                     -DSS_TIMER=4
@@ -842,7 +843,6 @@ lib_deps          = ${env:STM32F103RC_btt_512K.lib_deps}
 platform          = ${common_stm32f1.platform}
 extends           = common_stm32f1
 board             = genericSTM32F103RE
-platform_packages = tool-stm32duino
 monitor_speed     = 115200
 
 #
@@ -922,7 +922,6 @@ build_flags   = ${common_stm32f1.build_flags}
   -DMCU_STM32F103VE -DSTM32F1xx -USERIAL_USB -DU20 -DTS_V12
 build_unflags = ${common_stm32f1.build_unflags}
   -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
-lib_ignore    = ${common_stm32f1.lib_ignore}
 
 #
 # MKS Robin Mini (STM32F103VET6)
@@ -943,7 +942,6 @@ build_flags   = ${common_stm32f1.build_flags}
 platform        = ${common_stm32f1.platform}
 extends         = common_stm32f1
 board           = genericSTM32F103VE
-platform_packages = tool-stm32duino
 extra_scripts   = ${common.extra_scripts}
   buildroot/share/PlatformIO/scripts/mks_robin_nano35.py
 build_flags     = ${common_stm32f1.build_flags}
@@ -1024,7 +1022,6 @@ build_flags   = ${common_stm32f1.build_flags}
 platform        = ${common_stm32f1.platform}
 extends         = common_stm32f1
 board           = genericSTM32F103VE
-platform_packages = tool-stm32duino
 extra_scripts   = ${common.extra_scripts}
   buildroot/share/PlatformIO/scripts/mks_robin_e3p.py
 build_flags     = ${common_stm32f1.build_flags}
@@ -1153,7 +1150,6 @@ upload_protocol = jlink
 platform          = ${common_stm32f1.platform}
 extends           = common_stm32f1
 board             = genericSTM32F103VE
-platform_packages = tool-stm32duino
 extra_scripts     = ${common.extra_scripts}
   buildroot/share/PlatformIO/scripts/mks_robin_mini.py
   buildroot/share/PlatformIO/scripts/add_nanolib.py
@@ -1195,7 +1191,6 @@ extra_scripts     = ${common.extra_scripts}
 platform          = ${common_stm32f1.platform}
 extends           = common_stm32f1
 board             = genericSTM32F103RC
-platform_packages = tool-stm32duino
 extra_scripts     = ${common.extra_scripts}
  buildroot/share/PlatformIO/scripts/fly_mini.py
 build_flags       = ${common_stm32f1.build_flags}