From f2940adcf1829969f626ccc06af8fd7c948c2127 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Thu, 4 Jul 2024 17:50:34 -0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20Drop=20BTT=20Manta=20XFER=20envi?=
 =?UTF-8?q?ronments=20(#27240)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

USB is connected to SoC (CM4/CB1/CB2), not MCU
---
 Marlin/src/pins/pins.h | 10 +++++-----
 ini/renamed.ini        |  6 ++++++
 ini/stm32g0.ini        | 26 --------------------------
 3 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index d8776f6abb..1a356b17d7 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -564,15 +564,15 @@
 #elif MB(BTT_SKR_MINI_E3_V3_0)
   #include "stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h"    // STM32G0                              env:STM32G0B1RE_btt env:STM32G0B1RE_btt_xfer
 #elif MB(BTT_MANTA_M4P_V2_1)
-  #include "stm32g0/pins_BTT_MANTA_M4P_V2_1.h"      // STM32G0                              env:STM32G0B1RE_manta_btt env:STM32G0B1RE_manta_btt_xfer
+  #include "stm32g0/pins_BTT_MANTA_M4P_V2_1.h"      // STM32G0                              env:STM32G0B1RE_manta_btt
 #elif MB(BTT_MANTA_M5P_V1_0)
-  #include "stm32g0/pins_BTT_MANTA_M5P_V1_0.h"      // STM32G0                              env:STM32G0B1RE_manta_btt env:STM32G0B1RE_manta_btt_xfer
+  #include "stm32g0/pins_BTT_MANTA_M5P_V1_0.h"      // STM32G0                              env:STM32G0B1RE_manta_btt
 #elif MB(BTT_MANTA_E3_EZ_V1_0)
-  #include "stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h"    // STM32G0                              env:STM32G0B1RE_manta_btt env:STM32G0B1RE_manta_btt_xfer
+  #include "stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h"    // STM32G0                              env:STM32G0B1RE_manta_btt
 #elif MB(BTT_MANTA_M8P_V1_0)
-  #include "stm32g0/pins_BTT_MANTA_M8P_V1_0.h"      // STM32G0                              env:STM32G0B1VE_btt env:STM32G0B1VE_btt_xfer
+  #include "stm32g0/pins_BTT_MANTA_M8P_V1_0.h"      // STM32G0                              env:STM32G0B1VE_btt
 #elif MB(BTT_MANTA_M8P_V1_1)
-  #include "stm32g0/pins_BTT_MANTA_M8P_V1_1.h"      // STM32G0                              env:STM32G0B1VE_btt env:STM32G0B1VE_btt_xfer
+  #include "stm32g0/pins_BTT_MANTA_M8P_V1_1.h"      // STM32G0                              env:STM32G0B1VE_btt
 
 //
 // STM32 ARM Cortex-M3
diff --git a/ini/renamed.ini b/ini/renamed.ini
index 85f2df2862..5540374c68 100644
--- a/ini/renamed.ini
+++ b/ini/renamed.ini
@@ -98,3 +98,9 @@ extends = renamed
 
 [env:STM32F446_tronxy]                ;=> TRONXY_CXY_446_V10
 extends = renamed
+
+[env:STM32G0B1RE_manta_btt_xfer]      ;=> STM32G0B1RE_manta_btt
+extends = renamed
+
+[env:STM32G0B1VE_btt_xfer]            ;=> STM32G0B1VE_btt
+extends = renamed
diff --git a/ini/stm32g0.ini b/ini/stm32g0.ini
index 77bdde7438..40493b3ff1 100644
--- a/ini/stm32g0.ini
+++ b/ini/stm32g0.ini
@@ -88,21 +88,6 @@ extends         = env:STM32G0B1RE_btt
 build_flags     = ${env:STM32G0B1RE_btt.build_flags}
                   -DPIN_SERIAL3_RX=PD_9 -DPIN_SERIAL3_TX=PD_8 -DENABLE_HWSERIAL3
 
-#
-# BigTreeTech Manta M4P V2.1 (STM32G0B0RET6 ARM Cortex-M0+)
-# BigTreeTech Manta E3 EZ V1.0 / Manta M5P V1.0 (STM32G0B1RET6 ARM Cortex-M0+)
-# Custom upload to SD via Marlin with Binary Protocol
-# Requires Marlin with BINARY_FILE_TRANSFER already installed on the target board.
-# If CUSTOM_FIRMWARE_UPLOAD is also installed, Marlin will reboot the board to install the firmware.
-# Currently CUSTOM_FIRMWARE_UPLOAD must also be enabled to use 'xfer' build envs.
-#
-[env:STM32G0B1RE_manta_btt_xfer]
-extends         = env:STM32G0B1RE_manta_btt
-build_flags     = ${env:STM32G0B1RE_manta_btt.build_flags} -DXFER_BUILD
-extra_scripts   = ${env:STM32G0B1RE_manta_btt.extra_scripts}
-                  pre:buildroot/share/scripts/upload.py
-upload_protocol = custom
-
 #
 # BigTreeTech Manta M8P V1.x (STM32G0B1VET6 ARM Cortex-M0+)
 #
@@ -123,14 +108,3 @@ build_flags                 = ${stm32_variant.build_flags}
                               -Wl,--no-warn-rwx-segment
 upload_protocol             = stlink
 debug_tool                  = stlink
-
-#
-# BigTreeTech Manta M8P V1.x (STM32G0B1VET6 ARM Cortex-M0+)
-# Custom upload to SD via Marlin with Binary Protocol
-#
-[env:STM32G0B1VE_btt_xfer]
-extends         = env:STM32G0B1VE_btt
-build_flags     = ${env:STM32G0B1VE_btt.build_flags} -DXFER_BUILD
-extra_scripts   = ${env:STM32G0B1VE_btt.extra_scripts}
-                  pre:buildroot/share/scripts/upload.py
-upload_protocol = custom