Message ID | 1351110182-22681-5-git-send-email-andrew@bradfordembedded.com |
---|---|
State | Superseded |
Delegated to: | Tom Rini |
Headers | show |
On Wed, Oct 24, 2012 at 04:23:02PM -0400, Andrew Bradford wrote: > 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. > > Signed-off-by: Andrew Bradford <andrew@bradfordembedded.com> > --- > Changes from v2: > Set CONS_INDEX and SERIALX in the target options instead of > using AM33XX_UART_SELECT resulting in an easier to read config. > Changes from v1: > Add UART3 target and register location > > boards.cfg | 5 +++++ > include/configs/am335x_evm.h | 12 +++++++++++- > 2 files changed, 16 insertions(+), 1 deletion(-) > > diff --git a/boards.cfg b/boards.cfg > index b14a08f..0024033 100644 > --- a/boards.cfg > +++ b/boards.cfg > @@ -226,6 +226,11 @@ 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:SERIAL2=1,CONS_INDEX=2 This could just be am335x_evm:SERIAL2,CONS_INDEX=2 right? We don't check the value of CONFIG_SERIAL2 (or 3 or ..) just tha it's set, correct? [snip] > /* > - * select serial console configuration > + * select serial console configuration, uart0 always enabled > */ > #define CONFIG_SERIAL1 1 > +#ifndef CONFIG_CONS_INDEX > #define CONFIG_CONS_INDEX 1 > +#endif /* CONFIG_CONS_INDEX */ Just amke CONS_INDEX=1 be the default in boards.cfg. Makes it clear all around when folks add new config targets they must set that.
On Wed, 24 Oct 2012 13:39:06 -0700 Tom Rini <trini@ti.com> wrote: > On Wed, Oct 24, 2012 at 04:23:02PM -0400, Andrew Bradford wrote: > > > 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. > > > > Signed-off-by: Andrew Bradford <andrew@bradfordembedded.com> > > --- > > Changes from v2: > > Set CONS_INDEX and SERIALX in the target options instead of > > using AM33XX_UART_SELECT resulting in an easier to read > > config. Changes from v1: > > Add UART3 target and register location > > > > boards.cfg | 5 +++++ > > include/configs/am335x_evm.h | 12 +++++++++++- > > 2 files changed, 16 insertions(+), 1 deletion(-) > > > > diff --git a/boards.cfg b/boards.cfg > > index b14a08f..0024033 100644 > > --- a/boards.cfg > > +++ b/boards.cfg > > @@ -226,6 +226,11 @@ 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:SERIAL2=1,CONS_INDEX=2 > > This could just be am335x_evm:SERIAL2,CONS_INDEX=2 right? Right. > We don't > check the value of CONFIG_SERIAL2 (or 3 or ..) just tha it's set, > correct? Correct. > [snip] > > /* > > - * select serial console configuration > > + * select serial console configuration, uart0 always enabled > > */ > > #define CONFIG_SERIAL1 1 > > +#ifndef CONFIG_CONS_INDEX > > #define CONFIG_CONS_INDEX 1 > > +#endif /* CONFIG_CONS_INDEX */ > > Just amke CONS_INDEX=1 be the default in boards.cfg. Makes it clear > all around when folks add new config targets they must set that. Will do. v4 coming. Thanks, Andrew
diff --git a/boards.cfg b/boards.cfg index b14a08f..0024033 100644 --- a/boards.cfg +++ b/boards.cfg @@ -226,6 +226,11 @@ 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:SERIAL2=1,CONS_INDEX=2 +am335x_evm_uart2 arm armv7 am335x ti am33xx am335x_evm:SERIAL3=1,CONS_INDEX=3 +am335x_evm_uart3 arm armv7 am335x ti am33xx am335x_evm:SERIAL4=1,CONS_INDEX=4 +am335x_evm_uart4 arm armv7 am335x ti am33xx am335x_evm:SERIAL5=1,CONS_INDEX=5 +am335x_evm_uart5 arm armv7 am335x ti am33xx am335x_evm:SERIAL6=1,CONS_INDEX=6 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 339d4bd..b2df711 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,15 @@ #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_CONS_INDEX #define CONFIG_CONS_INDEX 1 +#endif /* CONFIG_CONS_INDEX */ #define CONFIG_SYS_CONSOLE_INFO_QUIET #define CONFIG_ENV_IS_NOWHERE
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. Signed-off-by: Andrew Bradford <andrew@bradfordembedded.com> --- Changes from v2: Set CONS_INDEX and SERIALX in the target options instead of using AM33XX_UART_SELECT resulting in an easier to read config. Changes from v1: Add UART3 target and register location boards.cfg | 5 +++++ include/configs/am335x_evm.h | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-)