serial: Kconfig: fix ordering of entries for menu display

Improve the "Non-8250 serial port support" menu so that entries in it
are displayed in a better order (_CONSOLE after its driver) and so that
intervening symbols don't break up the dependency list, allowing menu
entries to be displayed with proper indentation.

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Link: https://patch.msgid.link/20260110232643.3533351-4-rdunlap@infradead.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 98a946096be3c9b2ea941a9cb79dbec2782b417b..c73057d80bb169832be0961b7286b1874b3e6a44 100644 (file)
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -413,6 +413,10 @@ config SERIAL_21285_CONSOLE
          your boot loader (lilo or loadlin) about how to pass options to the
          kernel at boot time.)
 
+config SERIAL_PXA_NON8250
+       bool
+       depends on !SERIAL_8250 || COMPILE_TEST
+
 config SERIAL_PXA
        bool "PXA serial port support (DEPRECATED)"
        depends on ARCH_PXA || ARCH_MMP
@@ -426,10 +430,6 @@ config SERIAL_PXA
          Unless you have a specific need, you should use SERIAL_8250_PXA
          instead of this.
 
-config SERIAL_PXA_NON8250
-       bool
-       depends on !SERIAL_8250 || COMPILE_TEST
-
 config SERIAL_PXA_CONSOLE
        bool "Console on PXA serial port (DEPRECATED)"
        depends on SERIAL_PXA
@@ -863,15 +863,15 @@ config SERIAL_ICOM
          This driver can also be built as a module.  If so, the module
          will be called icom.
 
+config HAS_TXX9_SERIAL
+       bool
+
 config SERIAL_TXX9
        bool "TMPTX39XX/49XX SIO support"
        depends on HAS_TXX9_SERIAL
        select SERIAL_CORE
        default y
 
-config HAS_TXX9_SERIAL
-       bool
-
 config SERIAL_TXX9_NR_UARTS
        int "Maximum number of TMPTX39XX/49XX SIO ports"
        depends on SERIAL_TXX9
@@ -1251,12 +1251,6 @@ config SERIAL_AR933X_NR_UARTS
          Set this to the number of serial ports you want the driver
          to support.
 
-config SERIAL_MPS2_UART_CONSOLE
-       bool "MPS2 UART console support"
-       depends on SERIAL_MPS2_UART
-       select SERIAL_CORE_CONSOLE
-       select SERIAL_EARLYCON
-
 config SERIAL_MPS2_UART
        bool "MPS2 UART port"
        depends on ARCH_MPS2 || COMPILE_TEST
@@ -1264,6 +1258,12 @@ config SERIAL_MPS2_UART
        help
          This driver support the UART ports on ARM MPS2.
 
+config SERIAL_MPS2_UART_CONSOLE
+       bool "MPS2 UART console support"
+       depends on SERIAL_MPS2_UART
+       select SERIAL_CORE_CONSOLE
+       select SERIAL_EARLYCON
+
 config SERIAL_ARC
        tristate "ARC UART driver support"
        select SERIAL_CORE