diff options
author | Kim Phillips <kim.phillips@freescale.com> | 2013-02-04 11:16:26 -0600 |
---|---|---|
committer | Kim Phillips <kim.phillips@freescale.com> | 2013-02-04 11:16:26 -0600 |
commit | 9a32084ea0cf55d22384f083002ee9932e074f31 (patch) | |
tree | 726a2ee288654832876f3e81ff5f1d356e784e13 /drivers/serial/arm_dcc.c | |
parent | 8f171a56b58e2e89d0e5e995f074f774c2d64bc3 (diff) | |
parent | 2d795c9621de274cb0cb8cf4af5941293f89c3be (diff) | |
download | u-boot-imx-9a32084ea0cf55d22384f083002ee9932e074f31.zip u-boot-imx-9a32084ea0cf55d22384f083002ee9932e074f31.tar.gz u-boot-imx-9a32084ea0cf55d22384f083002ee9932e074f31.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'drivers/serial/arm_dcc.c')
-rw-r--r-- | drivers/serial/arm_dcc.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/drivers/serial/arm_dcc.c b/drivers/serial/arm_dcc.c index 7b5ecb5..c217c88 100644 --- a/drivers/serial/arm_dcc.c +++ b/drivers/serial/arm_dcc.c @@ -89,15 +89,6 @@ #define TIMEOUT_COUNT 0x4000000 -#ifndef CONFIG_ARM_DCC_MULTI -#define arm_dcc_init serial_init -void serial_setbrg(void) {} -#define arm_dcc_getc serial_getc -#define arm_dcc_putc serial_putc -#define arm_dcc_puts serial_puts -#define arm_dcc_tstc serial_tstc -#endif - int arm_dcc_init(void) { return 0; @@ -147,16 +138,10 @@ int arm_dcc_tstc(void) return reg; } -#ifdef CONFIG_ARM_DCC_MULTI static struct stdio_dev arm_dcc_dev; int drv_arm_dcc_init(void) { - int rc; - - /* Device initialization */ - memset(&arm_dcc_dev, 0, sizeof(arm_dcc_dev)); - strcpy(arm_dcc_dev.name, "dcc"); arm_dcc_dev.ext = 0; /* No extensions */ arm_dcc_dev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_OUTPUT; @@ -167,4 +152,8 @@ int drv_arm_dcc_init(void) return stdio_register(&arm_dcc_dev); } -#endif + +__weak struct serial_device *default_serial_console(void) +{ + return NULL; +} |