summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rwxr-xr-xaddseabios85
-rwxr-xr-xbuild-release18
-rwxr-xr-xbuilddeps5
-rwxr-xr-xbuilddeps-seabios46
-rwxr-xr-xcleandeps9
-rwxr-xr-xdeps-trisquel5
-rw-r--r--docs/git/index.html41
-rwxr-xr-xgetall5
-rwxr-xr-xgetseabios55
-rw-r--r--resources/grub/config/COPYING2
-rw-r--r--resources/grub/config/seabios.cfg4
-rw-r--r--resources/seabios/config/config90
13 files changed, 1 insertions, 365 deletions
diff --git a/.gitignore b/.gitignore
index bc510f9..5fbd015 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@
/memtest86+-5.01/
/bin/
/grubinvaders/
-/seabios/
/powertop/
/libreboot_src.tar.xz
/libreboot_util.tar.xz
diff --git a/addseabios b/addseabios
deleted file mode 100755
index 0680adf..0000000
--- a/addseabios
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/bash
-
-# addseabios script: add SeaBIOS to the ROM images.
-# This also adds SeaVGABIOS, SeaBIOS's free/libre video bios "wrapper" for coreboot native graphics
-#
-# Copyright (C) 2014 Francis Rowe <info@gluglug.org.uk>
-#
-# 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 -e -v
-
-CBFSTOOL="seebeeeffesstool"
-
-echo "Adding SeaBIOS and SeaVGABIOS to the ROM's"
-
-# Because the DEBLOB script isn't included in the binary archives.
-# This is how we know.
-if [ -f "DEBLOB" ]; then
- echo "Do not run this in meta/src directory. Do it in binary archive, either with libreboot-supplied ROM images or your own binary archive created with 'build-release'."
- exit 1
-fi
-
-if [ $(uname -i) = "i686" ] || [ $(uname -i) = "i686" ]
- then
- echo "You are on an i686 host"
- if [ ! -f "cbfstool/i686/cbfstool" ]; then
- echo "cbfstool binary not found. You will need to build it from source and put it in cbfstool/i686/"
- exit 1
- fi
- CBFSTOOL="../cbfstool/i686/cbfstool"
-elif [ $(uname -i) = "x86_64" ] || [ $(uname -i) = "x86_64" ]
- then
- echo "You are on an x86_64 host"
- if [ ! -f "cbfstool/x86_64/cbfstool" ]; then
- echo "cbfstool binary not found. You will need to build it from source and put it in cbfstool/x86_64/"
- exit 1
- fi
- CBFSTOOL="../cbfstool/x86_64/cbfstool"
-else
- echo "You need to run this script on an i686 or x86_64 host"
- exit 1
-fi
-
-# Add SeaBIOS and SeaVGABIOS to *all* ROM's
-cd bin/
-for rom in $(find -type f)
-do
- # Add them
- $(echo $CBFSTOOL) $rom add -f ../vgabios.bin -n vgaroms/vgabios.bin -t raw
- $(echo $CBFSTOOL) $rom add -f ../bios.bin.elf -n bios.bin.elf -t raw
-
- # Modify the GRUB configuration
- for config in grub.cfg grubtest.cfg
- do
- # Extract (dump) the config
- $(echo $CBFSTOOL) $rom extract -n $config -f $config
-
- # Delete it from the ROM
- $(echo $CBFSTOOL) $rom remove -n $config
-
- # Add the menuentry for loading SeaBIOS
- cat ../seabios.cfg >> $config
-
- # Re-add the newly modified GRUB configuration to the ROM
- $(echo $CBFSTOOL) $rom add -f $config -n $config -t raw
-
- # The GRUB configuration is no longer needed
- rm -f $config
- done
-done
-cd ../
-
-echo "DONE! All of the ROM's under bin/ have been modified to include SeaBIOS/SeaVGABIOS and include a GRUB menuentry for it."
diff --git a/build-release b/build-release
index 8eb733e..d95ee51 100755
--- a/build-release
+++ b/build-release
@@ -115,12 +115,6 @@ rm -rf .git
rm -f .gitignore
cd ../
-# SeaBIOS:
-cd seabios/
-rm -rf .git
-rm -f .gitignore
-cd ../
-
cd ../
# ### Prepare ROM archives ready for release
@@ -141,17 +135,6 @@ echo "Preparing libreboot_util release archive"
mkdir libreboot_util
-# ---------------
-# SeaBIOS related
-# ---------------
-# Include SeaBIOS and SeaVGABIOS option ROM in the binary archive
-cp seabios/out/vgabios.bin libreboot_util/
-cp seabios/out/bios.bin.elf libreboot_util/
-# Add the script for it
-cp addseabios libreboot_util/
-# Menu entry to be added to grub configs
-cp resources/grub/config/seabios.cfg libreboot_util/
-
# --------------
# BUC.TS related
# --------------
@@ -373,7 +356,6 @@ rm -f libreboot_src/getflashrom
rm -f libreboot_src/getgrub
rm -f libreboot_src/getgrubinvaders
rm -f libreboot_src/getmt86
-rm -f libreboot_src/getseabios
# ich9deblob: there are certain files in there
# that the user most likely does not want to share
diff --git a/builddeps b/builddeps
index bd0c358..7de2c4c 100755
--- a/builddeps
+++ b/builddeps
@@ -50,11 +50,6 @@ fi
./builddeps-flashrom
-# Build SeaBIOS (legacy X86 BIOS payload for coreboot)
-# --------------------------------------------------------------------
-
-./builddeps-seabios
-
# Build GRUB Invaders
# --------------------------------------------------------------------
diff --git a/builddeps-seabios b/builddeps-seabios
deleted file mode 100755
index 095b122..0000000
--- a/builddeps-seabios
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# builddeps-seabios: builds the dependencies that coreboot needs before building a ROM image
-#
-# Copyright (C) 2014 Francis Rowe <info@gluglug.org.uk>
-#
-# 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 -u -e -v
-
-# This script is used by the main "builddeps" script in libreboot src/meta archives.
-# The reason it is seperated here is so that seabios can be built separately aswell.
-
-# Build utilities needed in coreboot directory
-# --------------------------------------------------------------------
-
-cd seabios/
-
-# clean coreboot first
-make clean
-
-# copy the config that was created for this release
-cp ../resources/seabios/config/config .config
-
-# build
-make
-
-# delete the copy of the config (no longer needed)
-rm -f .config
-
-# done. go back to main directory
-cd ../
-
-# ------------------- DONE ----------------------
diff --git a/cleandeps b/cleandeps
index 88c028b..76181b3 100755
--- a/cleandeps
+++ b/cleandeps
@@ -99,15 +99,6 @@ rm -f flashrom_lenovobios_macronix
# done. go back to main directory
cd ../
-# clean seabios
-# --------------------------------------------------------
-
-cd seabios/
-
-make clean
-
-cd ../
-
# clean grubinvaders
# ----------------------------------------------------------
diff --git a/deps-trisquel b/deps-trisquel
index 37b2c8f..29b8975 100755
--- a/deps-trisquel
+++ b/deps-trisquel
@@ -59,11 +59,6 @@ fi
apt-get -y install build-essential
-# SeaBIOS build dependencies
-# ------------------------------------------------------------
-
-apt-get -y install build-essential
-
# GRUB Invaders build dependencies
# ------------------------------------------------------------
diff --git a/docs/git/index.html b/docs/git/index.html
index 02c8279..df2b0fc 100644
--- a/docs/git/index.html
+++ b/docs/git/index.html
@@ -41,7 +41,6 @@
</ul>
</li>
<li><a href="#build">How to build the ROM images</a></li>
- <li><a href="#build_addseabios">Add SeaBIOS to the ROM images</a></li>
</ul>
</div>
@@ -675,46 +674,6 @@
<div class="section">
- <h1 id="build_addseabios">How to add SeaBIOS to the ROM images</h1>
-
- <p>
- SeaBIOS isn't really needed since libreboot uses the GRUB payload which
- is much better (for several reasons), so it is no longer included in the ROM
- images by default. Instead, you can add it afterwards.
- </p>
-
- <p>
- In the supplied binary archives, or in your own (if you did 'build-release') you can add SeaBIOS
- to the ROM images, along with SeaVGABIOS which is a free/libre Video BIOS implementation that wraps
- around the 'native graphics initializitation' code in coreboot, for boards that have support for it.
- </p>
-
- <p>
- First, <a href="#build_dependencies">install the build dependencies</a>.
- </p>
-
- <p>
- Binaries for cbfstool are provided (built from libreboot_src) statically linked under cbfstool/ and the <b>addseabios</b>
- script (see below) will try to automatically select the right one to use.
- </p>
-
- <p>
- Now:<br/>
- $ <b>./addseabios</b>
- </p>
-
- <p>
- SeaBIOS and SeaVGABIOS (which the build scripts created, and the build-release script put - compiled -
- inside the binary archive) have now been added to all of the ROM images under ./bin/. A GRUB menuentry will show
- up when you boot your machine, allowing you to use SeaBIOS.
- </p>
-
- <p><a href="#pagetop">Back to top of page</a></p>
-
- </div>
-
- <div class="section">
-
<p>
Copyright &copy; 2014, 2015 Francis Rowe &lt;info@gluglug.org.uk&gt;<br/>
This document is released under the Creative Commons Attribution-ShareAlike 4.0 International Public License and all future versions.
diff --git a/getall b/getall
index f6c56f4..e187db7 100755
--- a/getall
+++ b/getall
@@ -45,11 +45,6 @@ set -u -e -v
./getmt86
-# Download SeaBIOS
-# ---------------------------------------------------
-
-./getseabios
-
# Download GRUB Invaders
# ---------------------------------------------------
diff --git a/getseabios b/getseabios
deleted file mode 100755
index 6e7d8b5..0000000
--- a/getseabios
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-# getseabios script: Downloads SeaBIOS and patches it.
-#
-# Copyright (C) 2014 Francis Rowe <info@gluglug.org.uk>
-#
-# 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 -u -e -v
-
-# Remove the old version that may still exist
-# -------------------------------------------------------------------------------
-
-echo "DOWNLOADING GRUB"
-
-rm -rf seabios
-
-# Get latest GRUB
-# -------------------------------------------------------------------------------
-
-# download it using git
-git clone git://git.seabios.org/seabios.git seabios
-
-cd seabios/
-
-# Reset to the last commit that was tested
-# --------------------------------------------------------------------------------
-
-git reset --hard ed675ad4193bc7f929e5b39074d50672970aefa3
-
-# Apply patches
-# --------------------------------------------------------------------------------
-
-# No patches needed for SeaBIOS at present.
-
-# we're done
-cd ../
-
-echo "FINISHED DOWNLOADING SEABIOS"
-
-# ------------------- DONE ----------------------
-
-
diff --git a/resources/grub/config/COPYING b/resources/grub/config/COPYING
index 05827f3..d3deca3 100644
--- a/resources/grub/config/COPYING
+++ b/resources/grub/config/COPYING
@@ -1,7 +1,7 @@
# GRUB configuration files under resources/grub/config/
#
-# Copyright (C) 2014 Francis Rowe
+# Copyright (C) 2014, 2015 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
diff --git a/resources/grub/config/seabios.cfg b/resources/grub/config/seabios.cfg
deleted file mode 100644
index 8c27be0..0000000
--- a/resources/grub/config/seabios.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-menuentry 'Load SeaBIOS' {
- set root='cbfsdisk'
- chainloader /bios.bin.elf
-}
diff --git a/resources/seabios/config/config b/resources/seabios/config/config
deleted file mode 100644
index 4bbba94..0000000
--- a/resources/seabios/config/config
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# SeaBIOS Configuration
-#
-
-#
-# General Features
-#
-CONFIG_COREBOOT=y
-# CONFIG_QEMU is not set
-# CONFIG_CSM is not set
-# CONFIG_QEMU_HARDWARE is not set
-CONFIG_THREADS=y
-CONFIG_RELOCATE_INIT=y
-CONFIG_BOOTMENU=y
-CONFIG_BOOTSPLASH=y
-CONFIG_BOOTORDER=y
-CONFIG_COREBOOT_FLASH=y
-CONFIG_LZMA=y
-CONFIG_CBFS_LOCATION=0
-CONFIG_FLASH_FLOPPY=y
-CONFIG_ENTRY_EXTRASTACK=y
-CONFIG_MALLOC_UPPERMEMORY=y
-CONFIG_ROM_SIZE=0
-
-#
-# Hardware support
-#
-CONFIG_ATA=y
-# CONFIG_ATA_DMA is not set
-# CONFIG_ATA_PIO32 is not set
-CONFIG_AHCI=y
-CONFIG_MEGASAS=y
-CONFIG_FLOPPY=y
-CONFIG_PS2PORT=y
-CONFIG_USB=y
-CONFIG_USB_UHCI=y
-CONFIG_USB_OHCI=y
-CONFIG_USB_EHCI=y
-CONFIG_USB_XHCI=y
-CONFIG_USB_MSC=y
-CONFIG_USB_UAS=y
-CONFIG_USB_HUB=y
-CONFIG_USB_KEYBOARD=y
-CONFIG_USB_MOUSE=y
-CONFIG_SERIAL=y
-CONFIG_LPT=y
-CONFIG_PMTIMER=y
-
-#
-# BIOS interfaces
-#
-CONFIG_DRIVES=y
-CONFIG_CDROM_BOOT=y
-CONFIG_CDROM_EMU=y
-CONFIG_PCIBIOS=y
-CONFIG_APMBIOS=y
-CONFIG_PNPBIOS=y
-CONFIG_OPTIONROMS=y
-CONFIG_PMM=y
-CONFIG_BOOT=y
-CONFIG_KEYBOARD=y
-CONFIG_KBD_CALL_INT15_4F=y
-CONFIG_MOUSE=y
-CONFIG_S3_RESUME=y
-CONFIG_VGAHOOKS=y
-# CONFIG_DISABLE_A20 is not set
-
-#
-# VGA ROM
-#
-# CONFIG_NO_VGABIOS is not set
-# CONFIG_VGA_STANDARD_VGA is not set
-# CONFIG_VGA_CIRRUS is not set
-# CONFIG_VGA_BOCHS is not set
-# CONFIG_VGA_GEODEGX2 is not set
-# CONFIG_VGA_GEODELX is not set
-CONFIG_VGA_COREBOOT=y
-CONFIG_BUILD_VGABIOS=y
-CONFIG_VGA_EMULATE_TEXT=y
-CONFIG_VGA_ALLOCATE_EXTRA_STACK=y
-CONFIG_VGA_EXTRA_STACK_SIZE=512
-CONFIG_VGA_VBE=y
-
-#
-# Debugging
-#
-CONFIG_DEBUG_LEVEL=1
-# CONFIG_DEBUG_SERIAL is not set
-CONFIG_DEBUG_COREBOOT=y