diff options
author | Francis Rowe <info@gluglug.org.uk> | 2014-07-20 07:37:00 +0000 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2014-08-22 19:15:07 +0200 |
commit | 488242eb941305ef61319b8499d4a1e8ccf218a1 (patch) | |
tree | b0347f360df51ac5a8edd06068e7ae24510864d6 /resources/grub/config/t60 | |
parent | 8b484a19b51fb0591d938b3b7cf4fcb8f06c7a2f (diff) | |
download | librebootfr-488242eb941305ef61319b8499d4a1e8ccf218a1.tar.gz librebootfr-488242eb941305ef61319b8499d4a1e8ccf218a1.zip |
Libreboot release 6 beta 3.
- Fixed typo that existed in 2nd beta where the release date of the
2nd beta was listed as being in year 2016, when in actual fact it
was 2014.
- Documentation: added (preliminary) details about (rare) buggy CPU's
on the ThinkPad T60 that were found to fail (instability, kernel
panics, etc) without the microcode updates.
- Documentation: added docs/howtos/x60_heatsink.html for showing how
to change the heatsink on the Thinkpad X60
- Added ROM images for Azerty (French) keyboard layout in GRUB
(courtesy of Olivier Mondoloni)
- Tidied up some scripts:
- Re-factored those scripts (made easier to read/maintain):
build-x60, build-x60t, build-t60, build-macbook21
- Reduced the number of grub configs to 2 (or 1, for macbook21), the
build scripts now generate the other configs at build time.
- Deleted build-x60, build-x60t, build-t60, build-macbook21 and
replaced with intelligent (generic) buildrom-withgrub script
- Updated build to use buildrom-withgrub script for building the ROM
images.
- coreboot.rom and coreboot_serial.rom renamed to
coreboot_usqwerty.rom and coreboot_serial_usqwerty.rom
- coreboot_dvorak and coreboot_serial_dvorak.rom renamed to
coreboot_usdvorak.rom and coreboot_serial_usdvorak.rom
- Renamed coreboot*rom to libreboot*rom
- Made flash, lenovobios_firstflash and lenovobios_secondflash
scripts fail if the specified file does not exist.
- Updated all relevant parts of the documentation to reflect the
above.
- Replaced background.png with background.jpg. added
gnulove.jpg. (resources/grub/background/)
- Updated buildrom-withgrub to use background.jpg instead of
background.png
- Updated buildrom-withgrub to use gnulove.jpg aswell
- Updated resources/grub/config/macbook21/grub*cfg to use gnulove.jpg
background.
- Updated resources/grub/config/{x60,t60,x60t}/grub*cfg to use
background.jpg background.
- Documentation: updated docs/index.html#grub_custom_keyboard to be
more generally useful.
- nvramtool:
- Updated builddeps-coreboot script to build it
- Updated build script to include it in libreboot_bin
- Documentation: added docs/howtos/x60_security.html (security
hardening for X60)
Diffstat (limited to 'resources/grub/config/t60')
-rw-r--r-- | resources/grub/config/t60/grub.cfg | 61 | ||||
-rw-r--r-- | resources/grub/config/t60/grub_serial.cfg | 71 | ||||
-rw-r--r-- | resources/grub/config/t60/grub_serial_ukdvorak.cfg | 71 | ||||
-rw-r--r-- | resources/grub/config/t60/grub_serial_ukqwerty.cfg | 71 | ||||
-rw-r--r-- | resources/grub/config/t60/grub_serial_usqwerty.cfg (renamed from resources/grub/config/t60/grub_serial_dvorak.cfg) | 3 | ||||
-rw-r--r-- | resources/grub/config/t60/grub_ukdvorak.cfg | 61 | ||||
-rw-r--r-- | resources/grub/config/t60/grub_ukqwerty.cfg | 61 | ||||
-rw-r--r-- | resources/grub/config/t60/grub_usqwerty.cfg (renamed from resources/grub/config/t60/grub_dvorak.cfg) | 3 |
8 files changed, 2 insertions, 400 deletions
diff --git a/resources/grub/config/t60/grub.cfg b/resources/grub/config/t60/grub.cfg deleted file mode 100644 index 2c34f8f6..00000000 --- a/resources/grub/config/t60/grub.cfg +++ /dev/null @@ -1,61 +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 - -keymap usqwerty -background_image (cbfsdisk)/background.png -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 '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/t60/grub_serial.cfg b/resources/grub/config/t60/grub_serial.cfg deleted file mode 100644 index bd337534..00000000 --- a/resources/grub/config/t60/grub_serial.cfg +++ /dev/null @@ -1,71 +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 - -keymap usqwerty -background_image (cbfsdisk)/background.png -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/t60/grub_serial_ukdvorak.cfg b/resources/grub/config/t60/grub_serial_ukdvorak.cfg deleted file mode 100644 index e52fec53..00000000 --- a/resources/grub/config/t60/grub_serial_ukdvorak.cfg +++ /dev/null @@ -1,71 +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 - -keymap ukdvorak -background_image (cbfsdisk)/background.png -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/t60/grub_serial_ukqwerty.cfg b/resources/grub/config/t60/grub_serial_ukqwerty.cfg deleted file mode 100644 index 63aeafee..00000000 --- a/resources/grub/config/t60/grub_serial_ukqwerty.cfg +++ /dev/null @@ -1,71 +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 - -keymap ukqwerty -background_image (cbfsdisk)/background.png -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/t60/grub_serial_dvorak.cfg b/resources/grub/config/t60/grub_serial_usqwerty.cfg index 6d493188..34ce1983 100644 --- a/resources/grub/config/t60/grub_serial_dvorak.cfg +++ b/resources/grub/config/t60/grub_serial_usqwerty.cfg @@ -27,8 +27,7 @@ set default="0" set timeout=1 set pager=1 -keymap dvorak -background_image (cbfsdisk)/background.png +background_image (cbfsdisk)/background.jpg loadfont (cbfsdisk)/dejavusansmono.pf2 menuentry 'Load Operating System' { diff --git a/resources/grub/config/t60/grub_ukdvorak.cfg b/resources/grub/config/t60/grub_ukdvorak.cfg deleted file mode 100644 index b7c572d0..00000000 --- a/resources/grub/config/t60/grub_ukdvorak.cfg +++ /dev/null @@ -1,61 +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 - -keymap ukdvorak -background_image (cbfsdisk)/background.png -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 '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/t60/grub_ukqwerty.cfg b/resources/grub/config/t60/grub_ukqwerty.cfg deleted file mode 100644 index e754843d..00000000 --- a/resources/grub/config/t60/grub_ukqwerty.cfg +++ /dev/null @@ -1,61 +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 - -keymap ukqwerty -background_image (cbfsdisk)/background.png -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 '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/t60/grub_dvorak.cfg b/resources/grub/config/t60/grub_usqwerty.cfg index eeb4a97c..4fa2e43d 100644 --- a/resources/grub/config/t60/grub_dvorak.cfg +++ b/resources/grub/config/t60/grub_usqwerty.cfg @@ -21,8 +21,7 @@ set default="0" set timeout=1 set pager=1 -keymap dvorak -background_image (cbfsdisk)/background.png +background_image (cbfsdisk)/background.jpg loadfont (cbfsdisk)/dejavusansmono.pf2 menuentry 'Load Operating System' { |