diff options
author | Peter Robinson <pbrobinson@gmail.com> | 2016-08-23 17:20:50 +0100 |
---|---|---|
committer | Peter Robinson <pbrobinson@gmail.com> | 2016-08-23 17:20:50 +0100 |
commit | 656a8be1e6d9c99f2ab3f499118957b1045deeae (patch) | |
tree | bb09eac08c74c42c280da7384b5d3a0fbdcb6d8d /arm64-avoid-needing-console-to-enable-serial-console.patch | |
parent | db34f96e9daf39b48d9938ad32b6c9a9ec372b94 (diff) | |
download | kernel-656a8be1e6d9c99f2ab3f499118957b1045deeae.tar.gz kernel-656a8be1e6d9c99f2ab3f499118957b1045deeae.tar.xz kernel-656a8be1e6d9c99f2ab3f499118957b1045deeae.zip |
Move to upstream patches for ACPI SPCR (serial console)
Diffstat (limited to 'arm64-avoid-needing-console-to-enable-serial-console.patch')
-rw-r--r-- | arm64-avoid-needing-console-to-enable-serial-console.patch | 46 |
1 files changed, 0 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 deleted file mode 100644 index 3c639a0a3..000000000 --- a/arm64-avoid-needing-console-to-enable-serial-console.patch +++ /dev/null @@ -1,46 +0,0 @@ -From ce7a9e482dcf66d155e74b39ada1708cf6d9cb25 Mon Sep 17 00:00:00 2001 -From: Mark Salter <msalter@redhat.com> -Date: Wed, 25 Mar 2015 14:17:50 -0400 -Subject: [PATCH] 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 | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c -index 9dc67769b6a4..dfac33b47423 100644 ---- a/arch/arm64/kernel/setup.c -+++ b/arch/arm64/kernel/setup.c -@@ -417,3 +417,22 @@ static int __init register_kernel_offset_dumper(void) - return 0; - } - __initcall(register_kernel_offset_dumper); -+ -+/* -+ * 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); --- -2.5.0 - |