Merge remote-tracking branch 'tty/tty-next'

[karo-tx-linux.git] / include / asm-generic / vmlinux.lds.h

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index e874efc3ba7122fcc28de4240893525ef69e1a59..7b0ef491440d74884fa824d4d8264b326e59cfcc 100644 (file)
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -150,6 +150,14 @@
 #define TRACE_SYSCALLS()
 #endif
 
+#ifdef CONFIG_SERIAL_EARLYCON
+#define EARLYCON_TABLE() . = ALIGN(8);                         \
+                        VMLINUX_SYMBOL(__earlycon_table) = .;  \
+                        *(__earlycon_table)                    \
+                        *(__earlycon_table_end)
+#else
+#define EARLYCON_TABLE()
+#endif
 
 #define ___OF_TABLE(cfg, name) _OF_TABLE_##cfg(name)
 #define __OF_TABLE(cfg, name)  ___OF_TABLE(cfg, name)
@@ -505,6 +513,7 @@
        CPUIDLE_METHOD_OF_TABLES()                                      \
        KERNEL_DTB()                                                    \
        IRQCHIP_OF_MATCH_TABLE()                                        \
+       EARLYCON_TABLE()                                                \
        EARLYCON_OF_TABLES()
 
 #define INIT_TEXT                                                      \