diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-11-03 10:05:22 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-11-03 10:05:22 +0100 |
| commit | a42c87f9d831c4eb36104255766cc7897876867c (patch) | |
| tree | 90dd6a5dad0e7e290d7df44cff746fb3319b3219 /include/configs/am335x_evm.h | |
| parent | d598e0fe739e5a75db74cc144beabd09e3c51433 (diff) | |
| parent | a956bdcb3ff759f753e3f0c5e40e58f4c3056e22 (diff) | |
| download | u-boot-imx-a42c87f9d831c4eb36104255766cc7897876867c.zip u-boot-imx-a42c87f9d831c4eb36104255766cc7897876867c.tar.gz u-boot-imx-a42c87f9d831c4eb36104255766cc7897876867c.tar.bz2 | |
Merge remote-tracking branch 'u-boot-ti/master'
Diffstat (limited to 'include/configs/am335x_evm.h')
| -rw-r--r-- | include/configs/am335x_evm.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 58d62d0..cdb6697 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -158,9 +158,15 @@ /* 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_COM4 0x481a6000 /* UART3 */ +#define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ +#define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */ /* I2C Configuration */ #define CONFIG_I2C @@ -182,11 +188,7 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 110, 300, 600, 1200, 2400, \ 4800, 9600, 14400, 19200, 28800, 38400, 56000, 57600, 115200 } -/* - * select serial console configuration - */ -#define CONFIG_SERIAL1 1 -#define CONFIG_CONS_INDEX 1 +#define CONFIG_ENV_OVERWRITE 1 #define CONFIG_SYS_CONSOLE_INFO_QUIET #define CONFIG_ENV_IS_NOWHERE |