From e1655d7c3a7699c5b9ba541df790276e3ce8e5ff Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Thu, 4 Dec 2014 09:38:54 -0800
Subject: [PATCH] aarch64 no longer needs explicit console setting (#1170413)

As of kernel-3.18.0-0.54 aarch64 can sort out what to use for the
console on its own, so drop the console= from the aarch64 grub2-efi.cfg
template.

Resolves: rhbz#1170413

(cherry picked from commit 519771a1dfe25b1fd257c8a7fa4fb42afc71eee1)
---
 share/config_files/aarch64/grub2-efi.cfg | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/share/config_files/aarch64/grub2-efi.cfg b/share/config_files/aarch64/grub2-efi.cfg
index 3cb8465f..1cc389d9 100644
--- a/share/config_files/aarch64/grub2-efi.cfg
+++ b/share/config_files/aarch64/grub2-efi.cfg
@@ -14,10 +14,6 @@ function load_video {
   fi
 }
 
-serial --speed=115200
-terminal_input serial console
-terminal_output serial console
-
 load_video
 set gfxpayload=keep
 insmod gzio
@@ -31,11 +27,11 @@ search --no-floppy --set=root -l '@ISOLABEL@'
 
 ### BEGIN /etc/grub.d/10_linux ###
 menuentry 'Install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os {
-	linux @KERNELPATH@ @ROOT@ ro console=ttyS0,115200n8
+	linux @KERNELPATH@ @ROOT@ ro
 	initrd @INITRDPATH@
 }
 menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os {
-	linux @KERNELPATH@ @ROOT@ rd.live.check console=ttyS0,115200n8
+	linux @KERNELPATH@ @ROOT@ rd.live.check
 	initrd @INITRDPATH@
 }
 submenu 'Troubleshooting -->' {
@@ -44,7 +40,7 @@ submenu 'Troubleshooting -->' {
 		initrd @INITRDPATH@
 	}
 	menuentry 'Rescue a @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os {
-		linux @KERNELPATH@ @ROOT@ rescue console=ttyS0,115200n8
+		linux @KERNELPATH@ @ROOT@ rescue
 		initrd @INITRDPATH@
 	}
 }