diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-03-26 07:49:10 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-03-26 07:49:10 -0400 |
| commit | 984fc80fab096128af2ffc8ae5f19672e1f96850 (patch) | |
| tree | 2288f7cc9bb537fdbb21108bbb7d79b557d6fdf0 /arm64-avoid-needing-console-to-enable-serial-console.patch | |
| parent | b4512393acd627e61019975bcf6084a0ebd25439 (diff) | |
| download | kernel-984fc80fab096128af2ffc8ae5f19672e1f96850.tar.gz kernel-984fc80fab096128af2ffc8ae5f19672e1f96850.tar.xz kernel-984fc80fab096128af2ffc8ae5f19672e1f96850.zip | |
Run dos2unix on recently added patch files
^M characters... they make my eyes BLEED
Diffstat (limited to 'arm64-avoid-needing-console-to-enable-serial-console.patch')
| -rw-r--r-- | arm64-avoid-needing-console-to-enable-serial-console.patch | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/arm64-avoid-needing-console-to-enable-serial-console.patch b/arm64-avoid-needing-console-to-enable-serial-console.patch index b9b11072c..7181fe95a 100644 --- a/arm64-avoid-needing-console-to-enable-serial-console.patch +++ b/arm64-avoid-needing-console-to-enable-serial-console.patch @@ -1,46 +1,46 @@ -From 3bba3a1990d065e30630c5c67ed32689106aef57 Mon Sep 17 00:00:00 2001
-From: Mark Salter <msalter@redhat.com>
-Date: Wed, 25 Mar 2015 14:17:50 -0400
-Subject: [PATCH 4/4] arm64: avoid needing console= to enable serial console
-
-Tell kernel to prefer one of the serial ports for console on
-platforms currently supported (pl011 or 8250). console= on
-command line will override these assumed preferences. This is
-just a hack to get the behavior we want from DT provided by
-firmware.
-
-Signed-off-by: Mark Salter <msalter@redhat.com>
----
- arch/arm64/kernel/setup.c | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
-index e8420f6..8473381 100644
---- a/arch/arm64/kernel/setup.c
-+++ b/arch/arm64/kernel/setup.c
-@@ -547,3 +547,22 @@ const struct seq_operations cpuinfo_op = {
- .stop = c_stop,
- .show = c_show
- };
-+
-+/*
-+ * Temporary hack to avoid need for console= on command line
-+ */
-+static int __init arm64_console_setup(void)
-+{
-+ /* Allow cmdline to override our assumed preferences */
-+ if (console_set_on_cmdline)
-+ return 0;
-+
-+ if (IS_ENABLED(CONFIG_SERIAL_AMBA_PL011))
-+ add_preferred_console("ttyAMA", 0, "115200");
-+
-+ if (IS_ENABLED(CONFIG_SERIAL_8250))
-+ add_preferred_console("ttyS", 0, "115200");
-+
-+ return 0;
-+}
-+early_initcall(arm64_console_setup);
---
-1.9.3
-
+From 3bba3a1990d065e30630c5c67ed32689106aef57 Mon Sep 17 00:00:00 2001 +From: Mark Salter <msalter@redhat.com> +Date: Wed, 25 Mar 2015 14:17:50 -0400 +Subject: [PATCH 4/4] arm64: avoid needing console= to enable serial console + +Tell kernel to prefer one of the serial ports for console on +platforms currently supported (pl011 or 8250). console= on +command line will override these assumed preferences. This is +just a hack to get the behavior we want from DT provided by +firmware. + +Signed-off-by: Mark Salter <msalter@redhat.com> +--- + arch/arm64/kernel/setup.c | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c +index e8420f6..8473381 100644 +--- a/arch/arm64/kernel/setup.c ++++ b/arch/arm64/kernel/setup.c +@@ -547,3 +547,22 @@ const struct seq_operations cpuinfo_op = { + .stop = c_stop, + .show = c_show + }; ++ ++/* ++ * Temporary hack to avoid need for console= on command line ++ */ ++static int __init arm64_console_setup(void) ++{ ++ /* Allow cmdline to override our assumed preferences */ ++ if (console_set_on_cmdline) ++ return 0; ++ ++ if (IS_ENABLED(CONFIG_SERIAL_AMBA_PL011)) ++ add_preferred_console("ttyAMA", 0, "115200"); ++ ++ if (IS_ENABLED(CONFIG_SERIAL_8250)) ++ add_preferred_console("ttyS", 0, "115200"); ++ ++ return 0; ++} ++early_initcall(arm64_console_setup); +-- +1.9.3 + |