[PATCH v6 01/12] of: earlycon: of_setup_earlycon() requires CONFIG_OF_EARLY_FLATTREE
STALE3891d
From: Peter Hurley <hidden>
Date: 2016-01-16 23:28:06
Also in:
lkml
Subsystem:
the rest, tty layer and serial drivers · Maintainers:
Linus Torvalds, Greg Kroah-Hartman, Jiri Slaby
Revision v6 of 4 in this series.
Revisions (4)
- v3 [diff vs current]
- v4 [diff vs current]
- v5 [diff vs current]
- v6 current
DT earlycon is only supported for CONFIG_OF_EARLY_FLATTREE=y; exclude of_setup_earlycon() if not defined. Signed-off-by: Peter Hurley <redacted> --- drivers/tty/serial/earlycon.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
index 3f24236..54419a2 100644
--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c@@ -204,6 +204,8 @@ static int __init param_setup_earlycon(char *buf) } early_param("earlycon", param_setup_earlycon); +#ifdef CONFIG_OF_EARLY_FLATTREE + int __init of_setup_earlycon(unsigned long addr, int (*setup)(struct earlycon_device *, const char *)) {
@@ -227,3 +229,5 @@ int __init of_setup_earlycon(unsigned long addr, register_console(early_console_dev.con); return 0; } + +#endif /* CONFIG_OF_EARLY_FLATTREE */
--
2.7.0