Provide a CONFIG_DM_STDIO option to enable registering a serial device with the stdio library. This is seldom useful in SPL, so disable it by default when building for SPL.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@ti.com ---
Changes in v3: - Add #ifdef around serial_stub_puts() to fix error when building SPL
Changes in v2: None
drivers/serial/serial-uclass.c | 10 +++++++--- include/config_defaults.h | 1 + 2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index 71f1a5c..66e6c2f 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -157,10 +157,12 @@ void serial_stdio_init(void) { }
+#ifdef CONFIG_DM_STDIO static void serial_stub_putc(struct stdio_dev *sdev, const char ch) { _serial_putc(sdev->priv, ch); } +#endif
void serial_stub_puts(struct stdio_dev *sdev, const char *str) { @@ -179,9 +181,11 @@ int serial_stub_tstc(struct stdio_dev *sdev)
static int serial_post_probe(struct udevice *dev) { - struct stdio_dev sdev; struct dm_serial_ops *ops = serial_get_ops(dev); +#ifdef CONFIG_DM_STDIO struct serial_dev_priv *upriv = dev->uclass_priv; + struct stdio_dev sdev; +#endif int ret;
/* Set the baud rate */ @@ -191,9 +195,9 @@ static int serial_post_probe(struct udevice *dev) return ret; }
+#ifdef CONFIG_DM_STDIO if (!(gd->flags & GD_FLG_RELOC)) return 0; - memset(&sdev, '\0', sizeof(sdev));
strncpy(sdev.name, dev->name, sizeof(sdev.name)); @@ -204,7 +208,7 @@ static int serial_post_probe(struct udevice *dev) sdev.getc = serial_stub_getc; sdev.tstc = serial_stub_tstc; stdio_register_dev(&sdev, &upriv->sdev); - +#endif return 0; }
diff --git a/include/config_defaults.h b/include/config_defaults.h index 985f055..f1b225d 100644 --- a/include/config_defaults.h +++ b/include/config_defaults.h @@ -22,6 +22,7 @@
#ifndef CONFIG_SPL_BUILD #define CONFIG_DM_DEVICE_REMOVE +#define CONFIG_DM_STDIO #endif
#endif