Merge git://git.denx.de/u-boot-mpc85xx

[oweals/u-boot.git] / drivers / serial / Kconfig

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index eba96f4a80d328b05cd2b6332b4550b176ca3061..1fc287ee98ec83c4e8c952d65e40578faa0619b0 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -53,6 +53,7 @@ config DEBUG_UART
 choice
        prompt "Select which UART will provide the debug UART"
        depends on DEBUG_UART
+       default DEBUG_UART_NS16550
 
 config DEBUG_UART_ALTERA_JTAGUART
        bool "Altera JTAG UART"
@@ -94,7 +95,7 @@ config DEBUG_UART_S5P
 config DEBUG_UART_ZYNQ
        bool "Xilinx Zynq"
        help
-         Select this to enable a debug UART using the serial_s5p driver. You
+         Select this to enable a debug UART using the serial_zynq driver. You
          will need to provide parameters to make this work. The driver will
          be available until the real driver-model serial is running.
 
@@ -185,14 +186,15 @@ config ALTERA_UART
          Select this to enable an UART for Altera devices. Please find
          details on the "Embedded Peripherals IP User Guide" of Altera.
 
-config ROCKCHIP_SERIAL
-       bool "Rockchip on-chip UART support"
-       depends on ARCH_ROCKCHIP && DM_SERIAL
+config SYS_NS16550
+       bool "NS16550 UART or compatible"
        help
-         Select this to enable a debug UART for Rockchip devices. This uses
-         the ns16550 driver. You will need to #define CONFIG_SYS_NS16550 in
-         your board config header. The clock input is automatically set to
-         use the oscillator (24MHz).
+         Support NS16550 UART or compatible. This can be enabled in the
+         device tree with the correct input clock frequency. If the input
+         clock frequency is not defined in the device tree, the macro
+         CONFIG_SYS_NS16550_CLK defined in a legacy board header file will
+         be used. It can be a constant or a function to get clock, eg,
+         get_serial_clock().
 
 config SANDBOX_SERIAL
        bool "Sandbox UART support"
@@ -221,14 +223,4 @@ config UNIPHIER_SERIAL
          If you have a UniPhier based board and want to use the on-chip
          serial ports, say Y to this option. If unsure, say N.
 
-config X86_SERIAL
-       bool "Support for 16550 serial port on x86 machines"
-       depends on X86
-       default y
-       help
-         Most x86 machines have a ns16550 UART or compatible. This can be
-         enabled in the device tree with the correct input clock frequency
-         provided (default 1843200). Enable this to obtain serial console
-         output.
-
 endmenu