diff options
| author | Tom Rini <trini@konsulko.com> | 2016-01-12 18:12:42 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-12 18:12:42 -0500 |
| commit | 077678eb0c226e52a1f90edabd3369ab26065b32 (patch) | |
| tree | e8bf70144f896a1ea09f694fe1182ba305b25df9 /drivers/serial/serial-uclass.c | |
| parent | e69514cc7087255d0e9754a9bf04129309d81ed5 (diff) | |
| parent | ab971e192adcf0a501c8998542ab116512c0c260 (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/serial/serial-uclass.c')
| -rw-r--r-- | drivers/serial/serial-uclass.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index 4bf9a5c681..1c447ff27a 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -204,7 +204,7 @@ void serial_stdio_init(void) { } -#ifdef CONFIG_DM_STDIO +#if defined(CONFIG_DM_STDIO) && CONFIG_IS_ENABLED(SERIAL_PRESENT) static void serial_stub_putc(struct stdio_dev *sdev, const char ch) { _serial_putc(sdev->priv, ch); @@ -287,6 +287,7 @@ static int on_baudrate(const char *name, const char *value, enum env_op op, } U_BOOT_ENV_CALLBACK(baudrate, on_baudrate); +#if CONFIG_IS_ENABLED(SERIAL_PRESENT) static int serial_post_probe(struct udevice *dev) { struct dm_serial_ops *ops = serial_get_ops(dev); @@ -356,3 +357,4 @@ UCLASS_DRIVER(serial) = { .pre_remove = serial_pre_remove, .per_device_auto_alloc_size = sizeof(struct serial_dev_priv), }; +#endif |