From cb96f9d6c0f61e7a1d17b8b1983173035379491c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20H=C3=B6rmann?= <johannes.hoermann@t-online.de>
Date: Sun, 2 Jan 2022 06:46:55 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20Upload=20to=20Optiboot=20at=2011?=
 =?UTF-8?q?5200=20(#23403)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/avr.ini    | 45 ++++++++++-----------------------------------
 ini/teensy.ini | 18 ++++++++++++++++++
 2 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/ini/avr.ini b/ini/avr.ini
index e4d64de712..92dd8f0cdb 100644
--- a/ini/avr.ini
+++ b/ini/avr.ini
@@ -106,14 +106,6 @@ extends                   = common_avr8
 board                     = sanguino_atmega1284p
 board_upload.maximum_size = 126976
 
-#
-# Melzi and clones (ATmega1284p)
-#
-[env:melzi]
-platform     = atmelavr
-extends      = env:sanguino1284p
-upload_speed = 57600
-
 #
 # Sanguinololu (ATmega1284p stock bootloader with tuned flags)
 #
@@ -123,15 +115,21 @@ build_flags = ${common.build_flags} -fno-tree-scev-cprop -fno-split-wide-types -
 
 [env:sanguino1284p_optimized]
 platform    = atmelavr
-extends     = env:melzi
+extends     = env:sanguino1284p
 build_flags = ${tuned_1284p.build_flags}
 
 #
-# Melzi and clones (alias for sanguino1284p_optimized)
+# Melzi and clones (ATmega1284p)
 #
+[env:melzi]
+platform     = atmelavr
+extends      = env:sanguino1284p
+upload_speed = 57600
+
 [env:melzi_optimized]
-platform = atmelavr
-extends  = env:sanguino1284p_optimized
+platform     = atmelavr
+extends      = env:sanguino1284p_optimized
+upload_speed = 57600
 
 #
 # Melzi and clones (Optiboot bootloader)
@@ -150,26 +148,3 @@ board_upload.maximum_size = 130048
 platform    = atmelavr
 extends     = env:melzi_optiboot
 build_flags = ${tuned_1284p.build_flags}
-
-#
-# AT90USB1286 boards using CDC bootloader
-# - BRAINWAVE
-# - BRAINWAVE_PRO
-# - SAV_MKI
-# - TEENSYLU
-#
-[env:at90usb1286_cdc]
-platform   = teensy
-extends    = common_avr8
-board      = marlin_at90usb1286
-lib_ignore = ${env:common_avr8.lib_ignore}, Teensy_ADC, NativeEthernet
-
-#
-# AT90USB1286 boards using DFU bootloader
-# - Printrboard
-# - Printrboard Rev.F
-# - ? 5DPRINT ?
-#
-[env:at90usb1286_dfu]
-platform = teensy
-extends  = env:at90usb1286_cdc
diff --git a/ini/teensy.ini b/ini/teensy.ini
index ef1ad766bc..f3e5fd0260 100644
--- a/ini/teensy.ini
+++ b/ini/teensy.ini
@@ -9,6 +9,24 @@
 #                               #
 #################################
 
+#
+# AT90USB1286 boards using CDC bootloader
+# e.g., BRAINWAVE, BRAINWAVE_PRO, SAV_MKI, TEENSYLU
+#
+[env:at90usb1286_cdc]
+platform   = teensy
+extends    = common_avr8
+board      = marlin_at90usb1286
+lib_ignore = ${env:common_avr8.lib_ignore}, Teensy_ADC, NativeEthernet
+
+#
+# AT90USB1286 boards using DFU bootloader
+# e.g., Printrboard, Printrboard Rev.F, 5DPRINT
+#
+[env:at90usb1286_dfu]
+platform = teensy
+extends  = env:at90usb1286_cdc
+
 #
 # Teensy++ 2.0
 #