⬆️ Assert newer GCC in PIO via atmelavr@~3.4 (#23432)

Sergey1560 · Jan 9, 2022 · 4efe478 · 4efe478
1 parent 2faf4e2
commit 4efe478
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 177 deletions.
diff --git a/ini/avr.ini b/ini/avr.ini
@@ -13,6 +13,7 @@
 # AVR (8-bit) Common Environment values
 #
 [common_avr8]
+platform          = atmelavr@~3.4
 build_flags       = ${common.build_flags} -Wl,--relax
 board_build.f_cpu = 16000000L
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
@@ -21,7 +22,6 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 # ATmega2560
 #
 [env:mega2560]
-platform = atmelavr
 extends  = common_avr8
 board    = megaatmega2560
 
@@ -33,7 +33,6 @@ board    = megaatmega2560
 # BOARD_EINSTART_S
 #
 [env:mega2560ext]
-platform            = atmelavr
 extends             = env:mega2560
 board_build.variant = MARLIN_MEGA_EXTENDED
 extra_scripts       = ${common.extra_scripts}
@@ -43,7 +42,6 @@ extra_scripts       = ${common.extra_scripts}
 # ATmega1280
 #
 [env:mega1280]
-platform = atmelavr
 extends  = common_avr8
 board    = megaatmega1280
 
@@ -61,47 +59,41 @@ build_flags         = ${common.build_flags} -fno-tree-scev-cprop -fno-split-wide
 # MightyBoard ATmega1280
 #
 [env:MightyBoard1280]
-platform = atmelavr
 extends  = mega_extended_optimized
 board    = megaatmega1280
 
 #
 # MightyBoard ATmega2560
 #
 [env:MightyBoard2560]
-platform = atmelavr
 extends  = mega_extended_optimized
 board    = megaatmega2560
 
 #
 # RAMBo
 #
 [env:rambo]
-platform = atmelavr
 extends  = common_avr8
 board    = reprap_rambo
 
 #
 # FYSETC F6 V1.3 / V1.4
 #
 [env:FYSETC_F6]
-platform = atmelavr
 extends  = common_avr8
 board    = fysetc_f6_13
 
 #
 # Sanguinololu (ATmega644p)
 #
 [env:sanguino644p]
-platform = atmelavr
 extends  = common_avr8
 board    = sanguino_atmega644p
 
 #
 # Sanguinololu (ATmega1284p)
 #
 [env:sanguino1284p]
-platform                  = atmelavr
 extends                   = common_avr8
 board                     = sanguino_atmega1284p
 board_upload.maximum_size = 126976
@@ -114,28 +106,24 @@ board_upload.maximum_size = 126976
 build_flags = ${common.build_flags} -fno-tree-scev-cprop -fno-split-wide-types -Wl,--relax -mcall-prologues
 
 [env:sanguino1284p_optimized]
-platform    = atmelavr
 extends     = env:sanguino1284p
 build_flags = ${tuned_1284p.build_flags}
 
 #
 # Melzi and clones (ATmega1284p)
 #
 [env:melzi]
-platform     = atmelavr
 extends      = env:sanguino1284p
 upload_speed = 57600
 
 [env:melzi_optimized]
-platform     = atmelavr
 extends      = env:sanguino1284p_optimized
 upload_speed = 57600
 
 #
 # Melzi and clones (Optiboot bootloader)
 #
 [env:melzi_optiboot]
-platform     = atmelavr
 extends      = common_avr8
 board        = sanguino_atmega1284p
 upload_speed = 115200
@@ -145,6 +133,5 @@ board_upload.maximum_size = 130048
 # Melzi and clones (Zonestar Melzi2 with tuned flags)
 #
 [env:melzi_optiboot_optimized]
-platform    = atmelavr
 extends     = env:melzi_optiboot
 build_flags = ${tuned_1284p.build_flags}
diff --git a/ini/due.ini b/ini/due.ini
@@ -21,15 +21,13 @@ board      = due
 src_filter = ${common.default_src_filter} +<src/HAL/DUE> +<src/HAL/shared/backtrace>
 
 [env:DUE_USB]
-platform = atmelsam
 extends  = env:DUE
 board    = dueUSB
 
 #
 # Archim SAM
 #
 [common_DUE_archim]
-platform                 = atmelsam
 extends                  = env:DUE
 board                    = marlin_archim
 build_flags              = ${common.build_flags}
@@ -39,5 +37,4 @@ extra_scripts            = ${common.extra_scripts}
   Marlin/src/HAL/DUE/upload_extra_script.py
 
 [env:DUE_archim]
-platform = ${common_DUE_archim.platform}
 extends  = common_DUE_archim
diff --git a/ini/esp32.ini b/ini/esp32.ini
@@ -24,12 +24,10 @@ monitor_speed = 250000
 #board_build.flash_mode = qio
 
 [env:FYSETC_E4]
-platform               = espressif32@2.1.0
 extends                = env:esp32
 board_build.partitions = default_16MB.csv
 
 [env:PANDA]
-platform      = espressif32@2.1.0
 extends       = env:esp32
 build_flags   = ${env:esp32.build_flags} -DUSE_ESP32_EXIO -DUSE_ESP32_TASK_WDT
 lib_deps      = ${common.lib_deps}
@@ -40,5 +38,4 @@ monitor_speed = 115200
 
 [env:mks_tinybee]
 extends                = env:esp32
-platform               = espressif32@2.1.0
 board_build.partitions = default_8MB.csv
diff --git a/ini/lpc176x.ini b/ini/lpc176x.ini
@@ -34,11 +34,9 @@ build_flags       = ${common.build_flags} -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC17
 # NXP LPC176x ARM Cortex-M3
 #
 [env:LPC1768]
-platform = ${common_LPC.platform}
 extends  = common_LPC
 board    = nxp_lpc1768
 
 [env:LPC1769]
-platform = ${common_LPC.platform}
 extends  = common_LPC
 board    = nxp_lpc1769
diff --git a/ini/native.ini b/ini/native.ini
@@ -52,12 +52,10 @@ extends     = simulator_common
 build_flags = ${simulator_common.build_flags} -ldl -lpthread -lSDL2 -lSDL2_net -lGL
 
 [env:simulator_linux_debug]
-platform   = ${simulator_linux.platform}
 extends    = simulator_linux
 build_type = debug
 
 [env:simulator_linux_release]
-platform    = ${simulator_linux.platform}
 extends     = simulator_linux
 build_type  = release
 build_flags = ${simulator_linux.build_flags} ${simulator_linux.release_flags}
@@ -92,13 +90,11 @@ build_flags       =
   -lSDL2
 
 [env:simulator_macos_debug]
-platform        = ${env:simulator_linux_release.platform}
 extends         = env:simulator_linux_debug
 build_flags     = ${env:simulator_linux_debug.build_flags} ${simulator_macos.build_flags} -ggdb -Og -D_THREAD_SAFE
 build_unflags   = ${simulator_macos.build_unflags}
 
 [env:simulator_macos_release]
-platform        = ${env:simulator_linux_release.platform}
 extends         = env:simulator_linux_release
 build_flags     = ${env:simulator_linux_release.build_flags} ${simulator_macos.build_flags}
 build_unflags   = ${simulator_macos.build_unflags}
@@ -110,7 +106,6 @@ build_unflags   = ${simulator_macos.build_unflags}
 #  pacman -S --needed base-devel mingw-w64-x86_64-toolchain mingw64/mingw-w64-x86_64-glm mingw64/mingw-w64-x86_64-SDL2 mingw64/mingw-w64-x86_64-SDL2_net mingw-w64-x86_64-dlfcn
 #
 [env:simulator_windows]
-platform    = ${simulator_common.platform}
 extends     = simulator_common
 src_build_flags = ${simulator_common.src_build_flags} -fpermissive
 build_flags = ${simulator_common.build_flags} ${simulator_common.debug_build_flags} -IC:\\msys64\\mingw64\\include\\SDL2 -fno-stack-protector -Wl,-subsystem,windows -ldl -lmingw32 -lSDL2main -lSDL2 -lSDL2_net -lopengl32 -lssp

diff --git a/ini/stm32f0.ini b/ini/stm32f0.ini
@@ -23,7 +23,6 @@
 # Malyan M200 v2 (STM32F070RB)
 #
 [env:STM32F070RB_malyan]
-platform    = ${common_stm32.platform}
 extends     = common_stm32
 board       = marlin_malyanM200v2
 build_flags = ${common_stm32.build_flags} -DHAL_PCD_MODULE_ENABLED
@@ -34,7 +33,6 @@ build_flags = ${common_stm32.build_flags} -DHAL_PCD_MODULE_ENABLED
 # Malyan M200 v2 (STM32F070CB)
 #
 [env:STM32F070CB_malyan]
-platform    = ${common_stm32.platform}
 extends     = common_stm32
 board       = malyanm200_f070cb
 build_flags = ${common_stm32.build_flags}
@@ -45,7 +43,6 @@ build_flags = ${common_stm32.build_flags}
 # Malyan M300 (STM32F070CB)
 #
 [env:malyan_M300]
-platform    = ${common_stm32.platform}
 extends     = common_stm32
 board       = malyanm300_f070cb
 build_flags = ${common_stm32.build_flags}