diff options
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/kernel-parameters.txt | 16 | ||||
-rw-r--r-- | Documentation/x86/x86_64/boot-options.txt | 14 |
2 files changed, 14 insertions, 16 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index de12397b60a9..b801a332fb6f 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -789,19 +789,31 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
789 | (mmio) or 32-bit (mmio32). | 789 | (mmio) or 32-bit (mmio32). |
790 | The options are the same as for ttyS, above. | 790 | The options are the same as for ttyS, above. |
791 | 791 | ||
792 | earlyprintk= [X86,SH,BLACKFIN] | 792 | earlyprintk= [X86,SH,BLACKFIN,ARM] |
793 | earlyprintk=vga | 793 | earlyprintk=vga |
794 | earlyprintk=xen | 794 | earlyprintk=xen |
795 | earlyprintk=serial[,ttySn[,baudrate]] | 795 | earlyprintk=serial[,ttySn[,baudrate]] |
796 | earlyprintk=serial[,0x...[,baudrate]] | ||
796 | earlyprintk=ttySn[,baudrate] | 797 | earlyprintk=ttySn[,baudrate] |
797 | earlyprintk=dbgp[debugController#] | 798 | earlyprintk=dbgp[debugController#] |
798 | 799 | ||
800 | earlyprintk is useful when the kernel crashes before | ||
801 | the normal console is initialized. It is not enabled by | ||
802 | default because it has some cosmetic problems. | ||
803 | |||
799 | Append ",keep" to not disable it when the real console | 804 | Append ",keep" to not disable it when the real console |
800 | takes over. | 805 | takes over. |
801 | 806 | ||
802 | Only vga or serial or usb debug port at a time. | 807 | Only vga or serial or usb debug port at a time. |
803 | 808 | ||
804 | Currently only ttyS0 and ttyS1 are supported. | 809 | Currently only ttyS0 and ttyS1 may be specified by |
810 | name. Other I/O ports may be explicitly specified | ||
811 | on some architectures (x86 and arm at least) by | ||
812 | replacing ttySn with an I/O port address, like this: | ||
813 | earlyprintk=serial,0x1008,115200 | ||
814 | You can find the port for a given device in | ||
815 | /proc/tty/driver/serial: | ||
816 | 2: uart:ST16650V2 port:00001008 irq:18 ... | ||
805 | 817 | ||
806 | Interaction with the standard serial driver is not | 818 | Interaction with the standard serial driver is not |
807 | very good. | 819 | very good. |
diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt index e015a83c3996..e9e8ddbbf376 100644 --- a/Documentation/x86/x86_64/boot-options.txt +++ b/Documentation/x86/x86_64/boot-options.txt | |||
@@ -91,20 +91,6 @@ APICs | |||
91 | apicmaintimer. Useful when your PIT timer is totally | 91 | apicmaintimer. Useful when your PIT timer is totally |
92 | broken. | 92 | broken. |
93 | 93 | ||
94 | Early Console | ||
95 | |||
96 | syntax: earlyprintk=vga | ||
97 | earlyprintk=serial[,ttySn[,baudrate]] | ||
98 | |||
99 | The early console is useful when the kernel crashes before the | ||
100 | normal console is initialized. It is not enabled by | ||
101 | default because it has some cosmetic problems. | ||
102 | Append ,keep to not disable it when the real console takes over. | ||
103 | Only vga or serial at a time, not both. | ||
104 | Currently only ttyS0 and ttyS1 are supported. | ||
105 | Interaction with the standard serial driver is not very good. | ||
106 | The VGA output is eventually overwritten by the real console. | ||
107 | |||
108 | Timing | 94 | Timing |
109 | 95 | ||
110 | notsc | 96 | notsc |