Commit c3f8318f33eb4eb79b3b5c5204a438d499572de0
Committed by
Tom Rini
Tom Rini
1 parent
96708a0605
Exists in
master
and in
54 other branches
am335x_evm: Enable use of UART{1,2,3,4,5}
Add targets of am335x_evm_uart{1,2,3,4,5} to have serial input/output on
UART{1,2,3,4,5} for use with the Beaglebone RS232 cape, am335x_evm
daughterboard, and other custom configurations.
Modify target for am335x_evm to include SERIAL1 and CONS_INDEX=1
options in order to clarify UART selection requirements.
Signed-off-by: Andrew Bradford <andrew@bradfordembedded.com>
Showing 2 changed files with 13 additions and 6 deletions Side-by-side Diff
boards.cfg
| ... | ... | @@ -225,7 +225,12 @@ |
| 225 | 225 | integratorap_cm946es arm arm946es integrator armltd - integratorap:CM946ES |
| 226 | 226 | integratorcp_cm946es arm arm946es integrator armltd - integratorcp:CM946ES |
| 227 | 227 | ca9x4_ct_vxp arm armv7 vexpress armltd |
| 228 | -am335x_evm arm armv7 am335x ti am33xx | |
| 228 | +am335x_evm arm armv7 am335x ti am33xx am335x_evm:SERIAL1,CONS_INDEX=1 | |
| 229 | +am335x_evm_uart1 arm armv7 am335x ti am33xx am335x_evm:SERIAL2,CONS_INDEX=2 | |
| 230 | +am335x_evm_uart2 arm armv7 am335x ti am33xx am335x_evm:SERIAL3,CONS_INDEX=3 | |
| 231 | +am335x_evm_uart3 arm armv7 am335x ti am33xx am335x_evm:SERIAL4,CONS_INDEX=4 | |
| 232 | +am335x_evm_uart4 arm armv7 am335x ti am33xx am335x_evm:SERIAL5,CONS_INDEX=5 | |
| 233 | +am335x_evm_uart5 arm armv7 am335x ti am33xx am335x_evm:SERIAL6,CONS_INDEX=6 | |
| 229 | 234 | highbank arm armv7 highbank - highbank |
| 230 | 235 | 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 |
| 231 | 236 | 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 |
include/configs/am335x_evm.h
| ... | ... | @@ -158,9 +158,15 @@ |
| 158 | 158 | /* NS16550 Configuration */ |
| 159 | 159 | #define CONFIG_SYS_NS16550 |
| 160 | 160 | #define CONFIG_SYS_NS16550_SERIAL |
| 161 | +#define CONFIG_SERIAL_MULTI | |
| 161 | 162 | #define CONFIG_SYS_NS16550_REG_SIZE (-4) |
| 162 | 163 | #define CONFIG_SYS_NS16550_CLK (48000000) |
| 163 | 164 | #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ |
| 165 | +#define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */ | |
| 166 | +#define CONFIG_SYS_NS16550_COM3 0x48024000 /* UART2 */ | |
| 167 | +#define CONFIG_SYS_NS16550_COM4 0x481a6000 /* UART3 */ | |
| 168 | +#define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ | |
| 169 | +#define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */ | |
| 164 | 170 | |
| 165 | 171 | /* I2C Configuration */ |
| 166 | 172 | #define CONFIG_I2C |
| ... | ... | @@ -182,11 +188,7 @@ |
| 182 | 188 | #define CONFIG_SYS_BAUDRATE_TABLE { 110, 300, 600, 1200, 2400, \ |
| 183 | 189 | 4800, 9600, 14400, 19200, 28800, 38400, 56000, 57600, 115200 } |
| 184 | 190 | |
| 185 | -/* | |
| 186 | - * select serial console configuration | |
| 187 | - */ | |
| 188 | -#define CONFIG_SERIAL1 1 | |
| 189 | -#define CONFIG_CONS_INDEX 1 | |
| 191 | +#define CONFIG_ENV_OVERWRITE 1 | |
| 190 | 192 | #define CONFIG_SYS_CONSOLE_INFO_QUIET |
| 191 | 193 | |
| 192 | 194 | #define CONFIG_ENV_IS_NOWHERE |