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

[karo-tx-linux.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 60a278948652fc019750b9b7c473fd1c0318a729..869e4d135a26628503e9a32bf4f220ce9aefb036 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -891,6 +891,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        which are not unmapped.
 
        earlycon=       [KNL] Output early console device and options.
+
                uart[8250],io,<addr>[,options]
                uart[8250],mmio,<addr>[,options]
                uart[8250],mmio32,<addr>[,options]
@@ -900,6 +901,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        (mmio) or 32-bit (mmio32).
                        The options are the same as for ttyS, above.
 
+               pl011,<addr>
+                       Start an early, polled-mode console on a pl011 serial
+                       port at the specified address. The pl011 serial port
+                       must already be setup and configured. Options are not
+                       yet supported.
+
+               smh     Use ARM semihosting calls for early console.
+
        earlyprintk=    [X86,SH,BLACKFIN,ARM]
                        earlyprintk=vga
                        earlyprintk=efi