stm32: Simplify USB/Serial/CANbus Kconfig selection

Combine the various communication options into a single "make
menuconfig" menu item.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

22 files changed, 68 insertions, 71 deletions

diff --git a/config/generic-bigtreetech-skr-e3-dip.cfg b/config/generic-bigtreetech-skr-e3-dip.cfg
index 985b99fd..01655d4f 100644
--- a/config/generic-bigtreetech-skr-e3-dip.cfg
+++ b/config/generic-bigtreetech-skr-e3-dip.cfg
@@ -1,8 +1,8 @@
 # This file contains common pin mappings for the BIGTREETECH SKR E3
 # DIP. To use this config, the firmware should be compiled for the
-# STM32F103 with a "28KiB bootloader". Also, select "Enable extra
-# low-level configuration options" and configure "GPIO pins to set at
-# micro-controller startup" to "!PC13".
+# STM32F103 with a "28KiB bootloader" and USB communication. Also,
+# select "Enable extra low-level configuration options" and configure
+# "GPIO pins to set at micro-controller startup" to "!PC13".
 
 # The "make flash" command does not work on the SKR E3 DIP. Instead,
 # after running "make", copy the generated "out/klipper.bin" file to a
diff --git a/config/generic-bigtreetech-skr-mini-e3-v1.0.cfg b/config/generic-bigtreetech-skr-mini-e3-v1.0.cfg
index eb7ef45d..463c90e3 100644
--- a/config/generic-bigtreetech-skr-mini-e3-v1.0.cfg
+++ b/config/generic-bigtreetech-skr-mini-e3-v1.0.cfg
@@ -1,8 +1,8 @@
 # This file contains common pin mappings for the BIGTREETECH SKR mini
 # E3. To use this config, the firmware should be compiled for the
-# STM32F103 with a "28KiB bootloader". Also, select "Enable extra
-# low-level configuration options" and configure "GPIO pins to set at
-# micro-controller startup" to "!PC13".
+# STM32F103 with a "28KiB bootloader" and USB communication. Also,
+# select "Enable extra low-level configuration options" and configure
+# "GPIO pins to set at micro-controller startup" to "!PC13".
 
 # The "make flash" command does not work on the SKR mini E3. Instead,
 # after running "make", copy the generated "out/klipper.bin" file to a
diff --git a/config/generic-bigtreetech-skr-mini-e3-v1.2.cfg b/config/generic-bigtreetech-skr-mini-e3-v1.2.cfg
index 2e9a9c8a..a255224b 100644
--- a/config/generic-bigtreetech-skr-mini-e3-v1.2.cfg
+++ b/config/generic-bigtreetech-skr-mini-e3-v1.2.cfg
@@ -1,8 +1,8 @@
 # This file contains common pin mappings for the BIGTREETECH SKR mini
 # E3 v1.2. To use this config, the firmware should be compiled for the
-# STM32F103 with a "28KiB bootloader". Also, select "Enable extra
-# low-level configuration options" and configure "GPIO pins to set at
-# micro-controller startup" to "!PC13".
+# STM32F103 with a "28KiB bootloader" and USB communication. Also,
+# select "Enable extra low-level configuration options" and configure
+# "GPIO pins to set at micro-controller startup" to "!PC13".
 
 # The "make flash" command does not work on the SKR mini E3. Instead,
 # after running "make", copy the generated "out/klipper.bin" file to a
diff --git a/config/generic-bigtreetech-skr-mini-e3-v2.0.cfg b/config/generic-bigtreetech-skr-mini-e3-v2.0.cfg
index 788cb150..6fb341b7 100644
--- a/config/generic-bigtreetech-skr-mini-e3-v2.0.cfg
+++ b/config/generic-bigtreetech-skr-mini-e3-v2.0.cfg
@@ -1,8 +1,8 @@
 # This file contains common pin mappings for the BIGTREETECH SKR mini
 # E3 v2.0. To use this config, the firmware should be compiled for the
-# STM32F103 with a "28KiB bootloader". Also, select "Enable extra
-# low-level configuration options" and configure "GPIO pins to set at
-# micro-controller startup" to "!PA14".
+# STM32F103 with a "28KiB bootloader" and USB communication. Also,
+# select "Enable extra low-level configuration options" and configure
+# "GPIO pins to set at micro-controller startup" to "!PA14".
 
 # The "make flash" command does not work on the SKR mini E3. Instead,
 # after running "make", copy the generated "out/klipper.bin" file to a
diff --git a/config/generic-bigtreetech-skr-mini-mz.cfg b/config/generic-bigtreetech-skr-mini-mz.cfg
index 2384e53b..c5268a0a 100644
--- a/config/generic-bigtreetech-skr-mini-mz.cfg
+++ b/config/generic-bigtreetech-skr-mini-mz.cfg
@@ -1,8 +1,8 @@
 # This file contains common pin mappings for the BIGTREETECH SKR mini
 # MZ v1.0. To use this config, the firmware should be compiled for the
-# STM32F103 with a "28KiB bootloader". Also, select "Enable extra
-# low-level configuration options" and configure "GPIO pins to set at
-# micro-controller startup" to "!PA14".
+# STM32F103 with a "28KiB bootloader" and USB communication. Also,
+# select "Enable extra low-level configuration options" and configure
+# "GPIO pins to set at micro-controller startup" to "!PA14".
 
 # The "make flash" command does not work on the SKR mini MZ. Instead,
 # after running "make", copy the generated "out/klipper.bin" file to a
diff --git a/config/generic-bigtreetech-skr-mini.cfg b/config/generic-bigtreetech-skr-mini.cfg
index b085b013..f2cf080d 100644
--- a/config/generic-bigtreetech-skr-mini.cfg
+++ b/config/generic-bigtreetech-skr-mini.cfg
@@ -1,6 +1,6 @@
 # This file contains common pin mappings for the BIGTREETECH SKR
 # MINI. To use this config, the firmware should be compiled for the
-# STM32F103 with a "28KiB bootloader".
+# STM32F103 with a "28KiB bootloader" and USB communication.
 
 # The "make flash" command does not work on the SKR mini. Instead,
 # after running "make", copy the generated "out/klipper.bin" file to a
diff --git a/config/generic-creality-v4.2.7.cfg b/config/generic-creality-v4.2.7.cfg
index ef09fb41..41226828 100644
--- a/config/generic-creality-v4.2.7.cfg
+++ b/config/generic-creality-v4.2.7.cfg
@@ -1,11 +1,11 @@
 # This file contains pin mappings for the Creality "v4.2.7" board. To
 # use this config, during "make menuconfig" select the STM32F103 with
-# a "28KiB bootloader" and with "Use USB for communication" disabled.
+# a "28KiB bootloader" and serial (on USART1 PA10/PA9) communication.
 
 # If you prefer a direct serial connection, in "make menuconfig"
-# select "Enable extra low-level configuration options" and select the
-# USART3 serial port, which is broken out on the 10 pin IDC cable used
-# for the LCD module as follows:
+# select "Enable extra low-level configuration options" and select
+# serial (on USART3 PB11/PB10), which is broken out on the 10 pin IDC
+# cable used for the LCD module as follows:
 # 3: Tx, 4: Rx, 9: GND, 10: VCC
 
 # Flash this firmware by copying "out/klipper.bin" to a SD card and
diff --git a/config/generic-fysetc-cheetah-v1.1.cfg b/config/generic-fysetc-cheetah-v1.1.cfg
index cae8f932..9650f37e 100644
--- a/config/generic-fysetc-cheetah-v1.1.cfg
+++ b/config/generic-fysetc-cheetah-v1.1.cfg
@@ -1,7 +1,7 @@
 # This file contains common pin mappings for the Fysetc Cheetah v1.1
 # board. To use this config, the firmware should be compiled for the
-# STM32F103 with "No bootloader" and with "Use USB for communication"
-# disabled.
+# STM32F103 with "No bootloader" and serial (on USART1 PA10/PA9)
+# communication.
 
 # The "make flash" command does not work on the Cheetah. Instead,
 # after running "make", run the following command to flash the board:
diff --git a/config/generic-mks-robin-e3.cfg b/config/generic-mks-robin-e3.cfg
index dac9d804..41eee77b 100644
--- a/config/generic-mks-robin-e3.cfg
+++ b/config/generic-mks-robin-e3.cfg
@@ -1,8 +1,8 @@
 # This file contains common pin mappings for MKS Robin E3 boards. To
 # use this config, the firmware should be compiled for the STM32F103.
 # When running "make menuconfig", enable "extra low-level
-# configuration setup", select the 20KiB bootloader, disable "USB for
-# communication", and select USART1 for the "Serial Port".
+# configuration setup", select the 20KiB bootloader, and serial (on
+# USART1 PA10/PA9) communication.
 
 # Note that the "make flash" command does not work with MKS Robin
 # boards. After running "make", run the following command:
diff --git a/config/generic-mks-robin-nano-v1.cfg b/config/generic-mks-robin-nano-v1.cfg
index 62e40119..bb096c81 100644
--- a/config/generic-mks-robin-nano-v1.cfg
+++ b/config/generic-mks-robin-nano-v1.cfg
@@ -1,8 +1,8 @@
 # This file contains common pin mappings for MKS Robin Nano (v1.2.004)
 # boards. To use this config, the firmware should be compiled for the
 # STM32F103. When running "make menuconfig", enable "extra low-level
-# configuration setup", select the 28KiB bootloader, disable "USB for
-# communication", and select USART3 for the "Serial Port".
+# configuration setup", select the 28KiB bootloader, and serial (on
+# USART3 PB11/PB10) communication.
 
 # Note that the "make flash" command does not work with MKS Robin
 # boards. After running "make", run the following command:
diff --git a/config/generic-mks-robin-nano-v2.cfg b/config/generic-mks-robin-nano-v2.cfg
index 80c707d7..e9da5115 100644
--- a/config/generic-mks-robin-nano-v2.cfg
+++ b/config/generic-mks-robin-nano-v2.cfg
@@ -1,8 +1,8 @@
 # This file contains common pin mappings for MKS Robin Nano V2
 # boards. To use this config, the firmware should be compiled for the
 # STM32F103. When running "make menuconfig", enable "extra low-level
-# configuration setup", select the 28KiB bootloader, disable "USB for
-# communication", and select USART3 for the "Serial Port".
+# configuration setup", select the 28KiB bootloader, and serial (on
+# USART3 PB11/PB10) communication.
 
 # Note that the "make flash" command does not work with MKS Robin
 # boards. After running "make", run the following command:
diff --git a/config/printer-alfawise-u30-2018.cfg b/config/printer-alfawise-u30-2018.cfg
index 0cdaae1d..d8b375e1 100644
--- a/config/printer-alfawise-u30-2018.cfg
+++ b/config/printer-alfawise-u30-2018.cfg
@@ -1,9 +1,9 @@
 # This file contains common pin mappings for the Alfawise U30 printer.
 # To use this config, the firmware should be compiled for the
 # STM32F103. When running "make menuconfig", enable "extra low-level
-# configuration setup", select the 64KiB bootloader, disable "USB for
-# communication", and set "GPIO pins to set at micro-controller
-# startup" to "!PC4,!PD12".
+# configuration setup", select the 64KiB bootloader, serial (on USART1
+# PA10/PA9) communication, and set "GPIO pins to set at
+# micro-controller startup" to "!PC4,!PD12".
 
 # The "make flash" command does not work on the Alfawise U30. Instead,
 # after running "make", copy the generated "out/klipper.bin" file to a
diff --git a/config/printer-creality-cr6se-2020.cfg b/config/printer-creality-cr6se-2020.cfg
index 10e5476f..11d827ea 100644
--- a/config/printer-creality-cr6se-2020.cfg
+++ b/config/printer-creality-cr6se-2020.cfg
@@ -1,7 +1,7 @@
 # This file contains pin mappings for the stock 2020 Creality CR6-SE.
-# To use this config, during "make menuconfig" select the
-# STM32F103 with a "28KiB bootloader" and with "Use USB for
-# communication" disabled.
+# To use this config, during "make menuconfig" select the STM32F103
+# with a "28KiB bootloader" and serial (on USART1 PA10/PA9)
+# communication.
 
 # Flash this firmware by copying "out/klipper.bin" to a SD card and
 # turning on the printer with the card inserted. The firmware
diff --git a/config/printer-creality-ender3-v2-2020.cfg b/config/printer-creality-ender3-v2-2020.cfg
index 7efe5fe2..a0ca79cb 100644
--- a/config/printer-creality-ender3-v2-2020.cfg
+++ b/config/printer-creality-ender3-v2-2020.cfg
@@ -1,12 +1,12 @@
 # This file contains pin mappings for the stock 2020 Creality Ender 3
 # V2. To use this config, during "make menuconfig" select the
-# STM32F103 with a "28KiB bootloader" and with "Use USB for
-# communication" disabled.
+# STM32F103 with a "28KiB bootloader" and serial (on USART1 PA10/PA9)
+# communication.
 
 # If you prefer a direct serial connection, in "make menuconfig"
-# select "Enable extra low-level configuration options" and select the
-# USART3 serial port, which is broken out on the 10 pin IDC cable used
-# for the LCD module as follows:
+# select "Enable extra low-level configuration options" and select
+# serial (on USART3 PB11/PB10), which is broken out on the 10 pin IDC
+# cable used for the LCD module as follows:
 # 3: Tx, 4: Rx, 9: GND, 10: VCC
 
 # Flash this firmware by copying "out/klipper.bin" to a SD card and
diff --git a/config/printer-creality-ender3max-2021.cfg b/config/printer-creality-ender3max-2021.cfg
index fa7559d7..dd975e02 100644
--- a/config/printer-creality-ender3max-2021.cfg
+++ b/config/printer-creality-ender3max-2021.cfg
@@ -1,7 +1,7 @@
 # This file contains pin mappings for the stock 2020 Creality Ender 3
 # MAX. To use this config, during "make menuconfig" select the
-# STM32F103 with a "28KiB bootloader" and with "Use USB for
-# communication" disabled.
+# STM32F103 with a "28KiB bootloader" and serial (on USART1 PA10/PA9)
+# communication.
 
 # Because this printer has factory wiring, mounts, and firmware for
 # a BLTouch, but does not ship with one at this time, default values
@@ -10,9 +10,9 @@
 # customize the offsets, particularly z-offset, for their specific unit.
 
 # If you prefer a direct serial connection, in "make menuconfig"
-# select "Enable extra low-level configuration options" and select the
-# USART3 serial port, which is broken out on the 10 pin IDC cable used
-# for the LCD module as follows:
+# select "Enable extra low-level configuration options" and select
+# serial (on USART3 PB11/PB10), which is broken out on the 10 pin IDC
+# cable used for the LCD module as follows:
 # 3: Tx, 4: Rx, 9: GND, 10: VCC
 
 # Flash this firmware by copying "out/klipper.bin" to a SD card and
diff --git a/config/printer-creality-ender3pro-2020.cfg b/config/printer-creality-ender3pro-2020.cfg
index b3a35528..04b5f004 100644
--- a/config/printer-creality-ender3pro-2020.cfg
+++ b/config/printer-creality-ender3pro-2020.cfg
@@ -1,12 +1,12 @@
 # This file contains pin mappings for the stock 2020 Creality Ender 3
 # Pro with the 32-bit Creality 4.2.2 board. To use this config, during
 # "make menuconfig" select the STM32F103 with a "28KiB bootloader" and
-# with "Use USB for communication" disabled.
+# serial (on USART1 PA10/PA9) communication.
 
 # If you prefer a direct serial connection, in "make menuconfig"
-# select "Enable extra low-level configuration options" and select the
-# USART3 serial port, which is broken out on the 10 pin IDC cable used
-# for the LCD module as follows:
+# select "Enable extra low-level configuration options" and select
+# serial (on USART3 PB11/PB10), which is broken out on the 10 pin IDC
+# cable used for the LCD module as follows:
 # 3: Tx, 4: Rx, 9: GND, 10: VCC
 
 # Flash this firmware by copying "out/klipper.bin" to a SD card and
diff --git a/config/printer-creality-ender6-2020.cfg b/config/printer-creality-ender6-2020.cfg
index 00875018..a5791a84 100644
--- a/config/printer-creality-ender6-2020.cfg
+++ b/config/printer-creality-ender6-2020.cfg
@@ -1,7 +1,7 @@
 # This file contains pin mappings for the stock 2020 Creality Ender 6.
-# To use this config, during "make menuconfig" select the
-# STM32F103 with a "28KiB bootloader" and with "Use USB for
-# communication" disabled.
+# To use this config, during "make menuconfig" select the STM32F103
+# with a "28KiB bootloader" and serial (on USART1 PA10/PA9)
+# communication.
 
 # Because this printer has factory wiring, mounts, and firmware for
 # a BLTouch, but does not ship with one at this time, default values
@@ -10,9 +10,9 @@
 # customize the offsets, particularly z-offset, for their specific unit.
 
 # If you prefer a direct serial connection, in "make menuconfig"
-# select "Enable extra low-level configuration options" and select the
-# USART3 serial port, which is broken out on the 10 pin IDC cable used
-# for the LCD module as follows:
+# select "Enable extra low-level configuration options" and select
+# serial (on USART3 PB11/PB10), which is broken out on the 10 pin IDC
+# cable used for the LCD module as follows:
 # 3: Tx, 4: Rx, 9: GND, 10: VCC
 
 # Flash this firmware by copying "out/klipper.bin" to a SD card and
diff --git a/config/printer-flsun-q5-2020.cfg b/config/printer-flsun-q5-2020.cfg
index 477309b7..59a44dca 100644
--- a/config/printer-flsun-q5-2020.cfg
+++ b/config/printer-flsun-q5-2020.cfg
@@ -3,8 +3,8 @@
 
 # To use this config, the firmware should be compiled for the
 # STM32F103. When running "make menuconfig", enable "extra low-level
-# configuration setup", select the 28KiB bootloader, disable "USB for
-# communication", and select USART3 for the "Serial Port".
+# configuration setup", select the 28KiB bootloader, and serial (on
+# USART3 PB11/PB10) communication.
 
 # Note that the "make flash" command does not work with MKS Robin
 # boards. After running "make", run the following command:
diff --git a/config/printer-monoprice-mini-delta-2017.cfg b/config/printer-monoprice-mini-delta-2017.cfg
index 0115ba77..b8cfc5e5 100644
--- a/config/printer-monoprice-mini-delta-2017.cfg
+++ b/config/printer-monoprice-mini-delta-2017.cfg
@@ -1,7 +1,6 @@
 # This file contains common pin mappings for the 2017 Monoprice
 # Mini Delta. To use this config, the firmware should be compiled for the
-# STM32F070 microcontroller with an 8MHz crystal and USB for communication
-# (instead of serial).
+# STM32F070 microcontroller with an 8MHz crystal and USB for communication.
 #
 # IMPORTANT: Use of Kipper with a Monoprice Mini Delta requires a power supply
 # with a _minimum_ 120 W (i.e. 10 A) capacity! The stock power supply will not
diff --git a/config/printer-monoprice-select-mini-v2-2018.cfg b/config/printer-monoprice-select-mini-v2-2018.cfg
index dd4ded29..3bc86c75 100644
--- a/config/printer-monoprice-select-mini-v2-2018.cfg
+++ b/config/printer-monoprice-select-mini-v2-2018.cfg
@@ -1,7 +1,6 @@
 # This file contains common pin mappings for the 2019 Monoprice
 # Select Mini v2. To use this config, the firmware should be compiled for the
-# STM32F070 microcontroller with an 8MHz crystal and USB for communication
-# (instead of serial).
+# STM32F070 microcontroller with an 8MHz crystal and USB for communication.
 #
 # Use the following settings in make menuconfig:
 #
diff --git a/config/printer-tronxy-x5sa-v6-2019.cfg b/config/printer-tronxy-x5sa-v6-2019.cfg
index 96639a99..069f60d6 100644
--- a/config/printer-tronxy-x5sa-v6-2019.cfg
+++ b/config/printer-tronxy-x5sa-v6-2019.cfg
@@ -1,15 +1,15 @@
-# This is a Klipper configuration for TronXY X5SA, with
-# CXY-V6 motherboard.
-
+# This is a Klipper configuration for TronXY X5SA, with CXY-V6
+# motherboard.
 
 #            === FLASHING WITH STOCK BOOTLOADER ===
 # You should make firmware for STM32F103 with bootloader offset
-# at 0x8008800 (Chitu v6 Bootloader). Uncheck USB, and leave default
-# serial settings.
-#
-# Use "./scripts/update_chitu.py ./out/klipper.bin ./out/update.cbd" after make to generate update.cbd.
-# Put `update.cbd` onto SD card, and reboot the printer.
-# It will be automatically installed, and you will be able to update it this way.
+# at 0x8008800 (Chitu v6 Bootloader) and serial (on USART1 PA10/PA9)
+# communication.
+
+# Use "./scripts/update_chitu.py ./out/klipper.bin ./out/update.cbd"
+# after make to generate update.cbd.  Put `update.cbd` onto SD card,
+# and reboot the printer.  It will be automatically installed, and you
+# will be able to update it this way.
 
 [mcu]
 serial: /dev/serial/by-id/usb-1a86_USB_Serial-if00-port0
diff --git a/config/printer-twotrees-sapphire-plus-2020.cfg b/config/printer-twotrees-sapphire-plus-2020.cfg
index 5212610d..9193ab56 100644
--- a/config/printer-twotrees-sapphire-plus-2020.cfg
+++ b/config/printer-twotrees-sapphire-plus-2020.cfg
@@ -5,8 +5,7 @@
 # When running "make menuconfig" you have to:
 # - enable "extra low-level configuration setup",
 # - select the 28KiB bootloader,
-# - disable "USB for communication"
-# - select USART3 for the "Serial Port"
+# - select serial (on USART3 PB11/PB10) communication
 # - set "GPIO pins to set at micro-controller startup" to "!PC6,!PD13"
 
 # Note that the "make flash" command does not work with the Sapphire