[U-Boot] [PATCH v2 3/3] serial: uartlite: Add uartlite to Kconfig

[Thomas Chou <thomas@wytron.com.tw>]

Hi Michal,

On 2015?12?17? 20:00, Michal Simek wrote:
> - Move config option out of board file.
> - Remove uartlite address from config file
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>
> Changes in v2: None
>
>   board/xilinx/microblaze-generic/xparameters.h | 4 ----
>   configs/microblaze-generic_defconfig          | 1 +
>   drivers/serial/Kconfig                        | 7 +++++++
>   include/configs/microblaze-generic.h          | 7 +------
>   4 files changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/board/xilinx/microblaze-generic/xparameters.h b/board/xilinx/microblaze-generic/xparameters.h
> index 8ba146cb88db..11b3c9a4846e 100644
> --- a/board/xilinx/microblaze-generic/xparameters.h
> +++ b/board/xilinx/microblaze-generic/xparameters.h
> @@ -28,10 +28,6 @@
>   #define XILINX_TIMER_BASEADDR	0x41c00000
>   #define XILINX_TIMER_IRQ	0
>
> -/* Uart pheriphery is RS232_Uart */
> -#define XILINX_UARTLITE_BASEADDR	0x40600000
> -#define XILINX_UARTLITE_BAUDRATE	115200
> -
>   /* IIC pheriphery is IIC_EEPROM */
>   #define XILINX_IIC_0_BASEADDR	0x40800000
>   #define XILINX_IIC_0_FREQ	100000
> diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
> index 5df080b6a87c..9a7bb915466f 100644
> --- a/configs/microblaze-generic_defconfig
> +++ b/configs/microblaze-generic_defconfig
> @@ -9,3 +9,4 @@ CONFIG_CMD_GPIO=y
>   # CONFIG_CMD_SETEXPR is not set
>   CONFIG_SPL_OF_CONTROL=y
>   CONFIG_OF_EMBED=y
> +CONFIG_XILINX_UARTLITE=y
> diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
> index f1e221799b81..ddf49ba9cef3 100644
> --- a/drivers/serial/Kconfig
> +++ b/drivers/serial/Kconfig
> @@ -230,4 +230,11 @@ 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 XILINX_UARTLITE
> +	bool "Xilinx Uarlite support"
> +	depends on DM_SERIAL && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP)
> +	help
> +	  If you have a Xilinx based board and want to use the uartlite
> +	  serial ports, say Y to this option. If unsure, say N.
> +
>   endmenu
> diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
> index 10ac8328b8ff..6e3c80b14350 100644
> --- a/include/configs/microblaze-generic.h
> +++ b/include/configs/microblaze-generic.h
> @@ -37,10 +37,7 @@
>   # define CONFIG_SYS_BAUDRATE_TABLE \
>   	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
>
> -#ifdef XILINX_UARTLITE_BASEADDR
> -# define CONFIG_XILINX_UARTLITE
> -# define CONFIG_SERIAL_BASE	XILINX_UARTLITE_BASEADDR
> -#elif XILINX_UART16550_BASEADDR
> +#if XILINX_UART16550_BASEADDR
>   # define CONFIG_SYS_NS16550_SERIAL
>   # if defined(__MICROBLAZEEL__)
>   #  define CONFIG_SYS_NS16550_REG_SIZE	-4
> @@ -51,8 +48,6 @@
>   # define CONFIG_SYS_NS16550_COM1 \
>   		((XILINX_UART16550_BASEADDR & ~0xF) + 0x1000)
>   # define CONFIG_SYS_NS16550_CLK	XILINX_UART16550_CLOCK_HZ
> -#else
> -# error Undefined uart
>   #endif
>
>   /* setting reset address */
>

Reviewed-by: Thomas Chou <thomas@wytron.com.tw>

Best regards,
Thomas