serial: arm_dcc: Remove CONFIG_ARM_DCC_MULTI option
CONFIG_ARM_DCC_MULTI should be also removed in the patch
"serial: Remove CONFIG_SERIAL_MULTI from serial drivers"
(sha1: a382725060
)
Because the driver defines serial_* functions
which cause conflict with serial.c (multiple definition of serial_*)
Removing CONFIG_SERIAL_MULTI function also require to define
default_serial_console for cases where another serial driver
is not available in the system.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Marek Vasut <marex@denx.de>
This commit is contained in:
parent
3981d02e0b
commit
e70fb539a6
|
@ -207,7 +207,7 @@ int stdio_init (void)
|
||||||
/* Initialize the list */
|
/* Initialize the list */
|
||||||
INIT_LIST_HEAD(&(devs.list));
|
INIT_LIST_HEAD(&(devs.list));
|
||||||
|
|
||||||
#ifdef CONFIG_ARM_DCC_MULTI
|
#ifdef CONFIG_ARM_DCC
|
||||||
drv_arm_dcc_init ();
|
drv_arm_dcc_init ();
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)
|
#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)
|
||||||
|
|
|
@ -89,15 +89,6 @@
|
||||||
|
|
||||||
#define TIMEOUT_COUNT 0x4000000
|
#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)
|
int arm_dcc_init(void)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -147,7 +138,6 @@ int arm_dcc_tstc(void)
|
||||||
return reg;
|
return reg;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_ARM_DCC_MULTI
|
|
||||||
static struct stdio_dev arm_dcc_dev;
|
static struct stdio_dev arm_dcc_dev;
|
||||||
|
|
||||||
int drv_arm_dcc_init(void)
|
int drv_arm_dcc_init(void)
|
||||||
|
@ -167,4 +157,8 @@ int drv_arm_dcc_init(void)
|
||||||
|
|
||||||
return stdio_register(&arm_dcc_dev);
|
return stdio_register(&arm_dcc_dev);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
__weak struct serial_device *default_serial_console(void)
|
||||||
|
{
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
|
@ -99,7 +99,7 @@ struct list_head* stdio_get_list(void);
|
||||||
struct stdio_dev* stdio_get_by_name(const char* name);
|
struct stdio_dev* stdio_get_by_name(const char* name);
|
||||||
struct stdio_dev* stdio_clone(struct stdio_dev *dev);
|
struct stdio_dev* stdio_clone(struct stdio_dev *dev);
|
||||||
|
|
||||||
#ifdef CONFIG_ARM_DCC_MULTI
|
#ifdef CONFIG_ARM_DCC
|
||||||
int drv_arm_dcc_init(void);
|
int drv_arm_dcc_init(void);
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_LCD
|
#ifdef CONFIG_LCD
|
||||||
|
|
Loading…
Reference in New Issue