[U-Boot] [PATCH 6/6] am335x_evm: Enable use of UART{1,2,4,5}

[Matt Porter]

On Wed, Sep 26, 2012 at 04:04:19PM -0400, Andrew Bradford wrote:
> Add targets of am335x_evm_uart{1,2,4,5} to have serial input/output on
> UART{1,2,4,5} for use with the Beaglebone RS232 cape and other custom
> configurations.

Add the UART3 target and I'll blow the dust off my EVM and try to test
it. :)

-Matt

> 
> Signed-off-by: Andrew Bradford <andrew at bradfordembedded.com>
> ---
>  boards.cfg                   |    4 ++++
>  include/configs/am335x_evm.h |   28 +++++++++++++++++++++++++++-
>  2 files changed, 31 insertions(+), 1 deletion(-)
> 
> diff --git a/boards.cfg b/boards.cfg
> index f789539..342de03 100644
> --- a/boards.cfg
> +++ b/boards.cfg
> @@ -220,6 +220,10 @@ integratorap_cm946es         arm         arm946es    integrator          armltd
>  integratorcp_cm946es         arm         arm946es    integrator          armltd         -               integratorcp:CM946ES
>  ca9x4_ct_vxp                 arm         armv7       vexpress            armltd
>  am335x_evm                   arm         armv7       am335x              ti             am33xx
> +am335x_evm_uart1             arm         armv7       am335x              ti             am33xx      am335x_evm:AM33XX_UART_SELECT=1
> +am335x_evm_uart2             arm         armv7       am335x              ti             am33xx      am335x_evm:AM33XX_UART_SELECT=2
> +am335x_evm_uart4             arm         armv7       am335x              ti             am33xx      am335x_evm:AM33XX_UART_SELECT=4
> +am335x_evm_uart5             arm         armv7       am335x              ti             am33xx      am335x_evm:AM33XX_UART_SELECT=5
>  highbank                     arm         armv7       highbank            -              highbank
>  mx51_efikamx                 arm         armv7       mx51_efikamx        genesi         mx5		mx51_efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_mx.cfg
>  mx51_efikasb                 arm         armv7       mx51_efikamx        genesi         mx5		mx51_efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKASB,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_sb.cfg
> diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
> index a3752bc..efb11d8 100644
> --- a/include/configs/am335x_evm.h
> +++ b/include/configs/am335x_evm.h
> @@ -158,9 +158,14 @@
>  /* NS16550 Configuration */
>  #define CONFIG_SYS_NS16550
>  #define CONFIG_SYS_NS16550_SERIAL
> +#define CONFIG_SERIAL_MULTI
>  #define CONFIG_SYS_NS16550_REG_SIZE	(-4)
>  #define CONFIG_SYS_NS16550_CLK		(48000000)
>  #define CONFIG_SYS_NS16550_COM1		0x44e09000	/* Base EVM has UART0 */
> +#define CONFIG_SYS_NS16550_COM2		0x48022000	/* UART1 */
> +#define CONFIG_SYS_NS16550_COM3		0x48024000	/* UART2 */
> +#define CONFIG_SYS_NS16550_COM5		0x481a8000	/* UART4 */
> +#define CONFIG_SYS_NS16550_COM6		0x481aa000	/* UART5 */
>  
>  /* I2C Configuration */
>  #define CONFIG_I2C
> @@ -182,11 +187,32 @@
>  #define CONFIG_SYS_BAUDRATE_TABLE	{ 110, 300, 600, 1200, 2400, \
>  4800, 9600, 14400, 19200, 28800, 38400, 56000, 57600, 115200 }
>  
> +#define CONFIG_ENV_OVERWRITE		1
> +
>  /*
> - * select serial console configuration
> + * select serial console configuration, uart0 always enabled
>   */
>  #define CONFIG_SERIAL1			1
> +#ifndef CONFIG_AM33XX_UART_SELECT
>  #define CONFIG_CONS_INDEX		1
> +#endif /* CONFIG_AM33XX_UART_SELECT */
> +
> +#if CONFIG_AM33XX_UART_SELECT == 1
> +#define CONFIG_SERIAL2			1
> +#define CONFIG_CONS_INDEX		2
> +#endif /* CONFIG_AM33XX_UART_SELECT == 1 */
> +#if CONFIG_AM33XX_UART_SELECT == 2
> +#define CONFIG_SERIAL3			1
> +#define CONFIG_CONS_INDEX		3
> +#endif /* CONFIG_AM33XX_UART_SELECT == 2 */
> +#if CONFIG_AM33XX_UART_SELECT == 4
> +#define CONFIG_SERIAL5			1
> +#define CONFIG_CONS_INDEX		5
> +#endif /* CONFIG_AM33XX_UART_SELECT == 4 */
> +#if CONFIG_AM33XX_UART_SELECT == 5
> +#define CONFIG_SERIAL6			1
> +#define CONFIG_CONS_INDEX		6
> +#endif /* CONFIG_AM33XX_UART_SELECT == 5 */
>  #define CONFIG_SYS_CONSOLE_INFO_QUIET
>  
>  #define CONFIG_ENV_IS_NOWHERE
> -- 
> 1.7.10
> 
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot