From 96ca7ee67a36605a33de8d57eb8e8d3998bc6427 Mon Sep 17 00:00:00 2001
From: Michał Masłowski <mtjm@mtjm.eu>
Date: Wed, 03 Sep 2014 14:30:21 -0400
Subject: Merge libreboot-6b6.

Conflicts:
	buildrom-withgrub
---
(limited to 'resources/grub/config/x60t')

diff --git a/resources/grub/config/x60t/grub_serial_usqwerty.cfg b/resources/grub/config/x60t/grub_serial_usqwerty.cfg
deleted file mode 100644
index 34ce198..0000000
--- a/resources/grub/config/x60t/grub_serial_usqwerty.cfg
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-#  GRUB configuration file which sits inside the root CBFS (coreboot filesystem)
-#
-#	Copyright (C) 2014 Francis Rowe
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# Serial and keyboard configuration, very important.
-serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1
-terminal_input --append  serial
-terminal_output --append serial
-terminal_input --append at_keyboard #add keyboard support.
-
-set default="0"
-set timeout=1
-set pager=1
-
-background_image (cbfsdisk)/background.jpg
-loadfont (cbfsdisk)/dejavusansmono.pf2
-
-menuentry 'Load Operating System' {
-	linux  (ahci0,1)/vmlinuz root=/dev/sda1
-	initrd  (ahci0,1)/initrd.img
-}
-menuentry 'Parse ISOLINUX menu (USB)' {
-	set root='usb0'
-	syslinux_configfile -i (usb0)/isolinux/isolinux.cfg
-}
-menuentry 'Parse ISOLINUX menu (CD)' {
-	set root='ata0'
-	syslinux_configfile -i (ata0)/isolinux/isolinux.cfg
-}
-menuentry 'Load MemTest86+ (serial port, baud 115200)' {
-	set root='cbfsdisk'
-	chainloader /memtest
-}
-menuentry 'Search for GRUB configuration on internal storage' {
-	insmod regexp
-	insmod ahci
-	insmod part_msdos
-	for x in (ahci0,*) ; do
-		if [ -f "$x/grub/grub.cfg" ] ; then
-			submenu "Load Config from $x" $x { 
-				root=$2
-				source /grub/grub.cfg
-				unset superusers
-			}
-		fi
-		if [ -f "$x/boot/grub/grub.cfg" ] ; then
-			submenu "Load Config from $x" $x {
-				root=$2
-				source /boot/grub/grub.cfg
-				unset superusers
-			}
-		fi
-	done
-}
-
diff --git a/resources/grub/config/x60t/grub_usqwerty.cfg b/resources/grub/config/x60t/grub_usqwerty.cfg
deleted file mode 100644
index cce7a44..0000000
--- a/resources/grub/config/x60t/grub_usqwerty.cfg
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-#  GRUB configuration file which sits inside the root CBFS (coreboot filesystem)
-#
-#	Copyright (C) 2014 Francis Rowe
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-set default="0"
-set timeout=1
-set pager=1
-
-background_image (cbfsdisk)/background.jpg
-loadfont (cbfsdisk)/dejavusansmono.pf2
-
-menuentry 'Load Operating System' {
-	linux  (ahci0,1)/vmlinuz root=/dev/sda1
-	initrd  (ahci0,1)/initrd.img
-}
-menuentry 'Parse ISOLINUX menu (USB)' {
-	set root='usb0'
-	syslinux_configfile -i (usb0)/isolinux/isolinux.cfg
-}
-menuentry 'Search for GRUB configuration on internal storage' {
-	insmod regexp
-	insmod ahci
-	insmod part_msdos
-	for x in (ahci0,*) ; do
-		if [ -f "$x/grub/grub.cfg" ] ; then
-			submenu "Load Config from $x" $x { 
-				root=$2
-				source /grub/grub.cfg
-				unset superusers
-			}
-		fi
-		if [ -f "$x/boot/grub/grub.cfg" ] ; then
-			submenu "Load Config from $x" $x {
-				root=$2
-				source /boot/grub/grub.cfg
-				unset superusers
-			}
-		fi
-	done
-}
-
--
cgit v0.9.1