From b6ccd2682c57688a55a408abaa87a6cc61924cf2 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Fri, 25 Jan 2019 17:55:57 -0500 Subject: [PATCH] Kconfig: Move SERIAL_BAUD to src/Kconfig and show with LOW_LEVEL_OPTIONS Move the definition of SERIAL_BAUD to the main src/Kconfig file. Only show this as an option if the user selects the ability to configure low-level options. Signed-off-by: Kevin O'Connor --- docs/Installation.md | 4 +--- src/Kconfig | 8 ++++++++ src/atsam/Kconfig | 4 ---- src/atsamd/Kconfig | 4 ---- src/avr/Kconfig | 4 ---- src/lpc176x/Kconfig | 4 ---- src/simulator/Kconfig | 4 ---- src/stm32f1/Kconfig | 4 ---- 8 files changed, 9 insertions(+), 27 deletions(-) diff --git a/docs/Installation.md b/docs/Installation.md index 23c14727..57d94cb8 100644 --- a/docs/Installation.md +++ b/docs/Installation.md @@ -50,9 +50,7 @@ make menuconfig ``` Select the appropriate micro-controller and review any other options -provided. For boards with serial ports, the recommended baud rate is -250000 (see the [FAQ](FAQ.md#how-do-i-change-the-serial-baud-rate) -before changing). Once configured, run: +provided. Once configured, run: ``` make diff --git a/src/Kconfig b/src/Kconfig index 6add97a3..f667dae4 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -38,6 +38,14 @@ source "src/pru/Kconfig" source "src/linux/Kconfig" source "src/simulator/Kconfig" +# Generic configuration options for serial ports +config SERIAL_BAUD + depends on SERIAL + int "Baud rate for serial port" if LOW_LEVEL_OPTIONS + default 250000 + help + Specify the baud rate of the serial port. This should be set + to 250000. Read the FAQ before changing this value. # Step timing customization config CUSTOM_STEP_DELAY diff --git a/src/atsam/Kconfig b/src/atsam/Kconfig index 03a86858..f4ab2285 100644 --- a/src/atsam/Kconfig +++ b/src/atsam/Kconfig @@ -62,9 +62,5 @@ config SERIAL depends on !USBSERIAL bool default y -config SERIAL_BAUD - depends on SERIAL - int "Baud rate for serial port" - default 250000 endif diff --git a/src/atsamd/Kconfig b/src/atsamd/Kconfig index 02e21b7b..cd9b6466 100644 --- a/src/atsamd/Kconfig +++ b/src/atsamd/Kconfig @@ -49,9 +49,5 @@ config SERIAL depends on !USBSERIAL bool default y -config SERIAL_BAUD - depends on SERIAL - int "Baud rate for serial port" - default 250000 endif diff --git a/src/avr/Kconfig b/src/avr/Kconfig index b6877ac6..65e86818 100644 --- a/src/avr/Kconfig +++ b/src/avr/Kconfig @@ -124,10 +124,6 @@ choice config AVR_SERIAL_UART3 bool "UART3" if MACH_atmega2560 || MACH_atmega1280 endchoice -config SERIAL_BAUD - depends on SERIAL - int "Baud rate for serial port" - default 250000 config SERIAL_BAUD_U2X depends on SERIAL && !SIMULAVR bool diff --git a/src/lpc176x/Kconfig b/src/lpc176x/Kconfig index f722aa3e..82fb200a 100644 --- a/src/lpc176x/Kconfig +++ b/src/lpc176x/Kconfig @@ -44,9 +44,5 @@ config SERIAL depends on !USBSERIAL bool default y -config SERIAL_BAUD - depends on SERIAL - int "Baud rate for serial port" - default 250000 endif diff --git a/src/simulator/Kconfig b/src/simulator/Kconfig index bb74fad6..41ebb8cd 100644 --- a/src/simulator/Kconfig +++ b/src/simulator/Kconfig @@ -19,8 +19,4 @@ config CLOCK_FREQ int default 20000000 -config SERIAL_BAUD - int - default 250000 - endif diff --git a/src/stm32f1/Kconfig b/src/stm32f1/Kconfig index 802c793a..3e57e7ad 100644 --- a/src/stm32f1/Kconfig +++ b/src/stm32f1/Kconfig @@ -38,9 +38,5 @@ config SERIAL depends on !USBSERIAL bool default y -config SERIAL_BAUD - depends on SERIAL - int "Baud rate for serial port" - default 250000 endif