diff options
author | Dave Hansen <dave@sr71.net> | 2013-04-10 17:03:38 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-04-11 04:30:40 -0400 |
commit | 147ea09119e45caf2e8bf57c9e54cc930ccfeda9 (patch) | |
tree | 5b7c02dc0cf0ea2feea5887a2bf72337d4ba029f | |
parent | c391c7884633cdc317a60fbf152d1764282fe633 (diff) |
x86, early-printk: Update earlyprintk documentation (and kill x86 copy)
Documentation/kernel-parameters.txt and
Documentation/x86/x86_64/boot-options.txt contain virtually
identical text describing earlyprintk.
This consolidates the two copies and updates the documentation a
bit. No one ever documented the:
earlyprintk=serial,0x1008,115200
syntax, nor mentioned that ARM is now a supported earlyprintk
arch.
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Rob Landley <rob@landley.net>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Dave Hansen <dave@sr71.net>
Link: http://lkml.kernel.org/r/20130410210338.E2930E98@viggo.jf.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-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 4609e81dbc37..b5cfd047becb 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -757,19 +757,31 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
757 | (mmio) or 32-bit (mmio32). | 757 | (mmio) or 32-bit (mmio32). |
758 | The options are the same as for ttyS, above. | 758 | The options are the same as for ttyS, above. |
759 | 759 | ||
760 | earlyprintk= [X86,SH,BLACKFIN] | 760 | earlyprintk= [X86,SH,BLACKFIN,ARM] |
761 | earlyprintk=vga | 761 | earlyprintk=vga |
762 | earlyprintk=xen | 762 | earlyprintk=xen |
763 | earlyprintk=serial[,ttySn[,baudrate]] | 763 | earlyprintk=serial[,ttySn[,baudrate]] |
764 | earlyprintk=serial[,0x...[,baudrate]] | ||
764 | earlyprintk=ttySn[,baudrate] | 765 | earlyprintk=ttySn[,baudrate] |
765 | earlyprintk=dbgp[debugController#] | 766 | earlyprintk=dbgp[debugController#] |
766 | 767 | ||
768 | earlyprintk is useful when the kernel crashes before | ||
769 | the normal console is initialized. It is not enabled by | ||
770 | default because it has some cosmetic problems. | ||
771 | |||
767 | Append ",keep" to not disable it when the real console | 772 | Append ",keep" to not disable it when the real console |
768 | takes over. | 773 | takes over. |
769 | 774 | ||
770 | Only vga or serial or usb debug port at a time. | 775 | Only vga or serial or usb debug port at a time. |
771 | 776 | ||
772 | Currently only ttyS0 and ttyS1 are supported. | 777 | Currently only ttyS0 and ttyS1 may be specified by |
778 | name. Other I/O ports may be explicitly specified | ||
779 | on some architectures (x86 and arm at least) by | ||
780 | replacing ttySn with an I/O port address, like this: | ||
781 | earlyprintk=serial,0x1008,115200 | ||
782 | You can find the port for a given device in | ||
783 | /proc/tty/driver/serial: | ||
784 | 2: uart:ST16650V2 port:00001008 irq:18 ... | ||
773 | 785 | ||
774 | Interaction with the standard serial driver is not | 786 | Interaction with the standard serial driver is not |
775 | very good. | 787 | 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 |