Merge git://git.denx.de/u-boot-fsl-qoriq

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

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index a8e997834ad21a5b81a7e40945bbc85c5e773b7f..7c54a49bb32ec050a0dfd1968f7a1d55527e7d1a 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -64,15 +64,20 @@ config DM_SERIAL
          implements serial_putc() etc. The uclass interface is
          defined in include/serial.h.
 
-config SERIAL_IRQ_BUFFER
-       bool "Enable RX interrupt buffer for serial input"
+config SERIAL_RX_BUFFER
+       bool "Enable RX buffer for serial input"
        depends on DM_SERIAL
-       default n
        help
-         Enable RX interrupt buffer support for the serial driver.
-         This enables pasting longer strings, even when the RX FIFO
-         of the UART is not big enough (e.g. 16 bytes on the normal
-         NS16550).
+         Enable RX buffer support for the serial driver. This enables
+         pasting longer strings, even when the RX FIFO of the UART is
+         not big enough (e.g. 16 bytes on the normal NS16550).
+
+config SERIAL_RX_BUFFER_SIZE
+       int "RX buffer size"
+       depends on SERIAL_RX_BUFFER
+       default 256
+       help
+         The size of the RX buffer (needs to be power of 2)
 
 config SPL_DM_SERIAL
        bool "Enable Driver Model for serial drivers in SPL"
@@ -409,6 +414,13 @@ config MXC_UART
          If you have a machine based on a Motorola IMX CPU you
          can enable its onboard serial port by enabling this option.
 
+config NULLDEV_SERIAL
+       bool "Null serial device"
+       help
+         Select this to enable null serial device support. A null serial
+         device merely acts as a placeholder for a serial device and does
+         nothing for all it's operation.
+
 config PIC32_SERIAL
        bool "Support for Microchip PIC32 on-chip UART"
        depends on DM_SERIAL && MACH_PIC32
@@ -519,10 +531,11 @@ config STI_ASC_SERIAL
 
 config STM32X7_SERIAL
        bool "STMicroelectronics STM32 SoCs on-chip UART"
-       depends on DM_SERIAL && STM32F7
+       depends on DM_SERIAL && (STM32F4 || STM32F7 || STM32H7)
        help
-         If you have a machine based on a STM32 F7 you can enable its
-         onboard serial ports, say Y to this option. If unsure, say N.
+         If you have a machine based on a STM32 F4, F7 or H7 SoC you can
+         enable its onboard serial ports, say Y to this option.
+         If unsure, say N.
 
 config MPC8XX_CONS
        bool "Console driver for MPC8XX"