From 34e0269745c16a8a70438dfb5a32931907e33161 Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Sun, 13 Dec 2015 17:18:48 -0500 Subject: remove seabios (this time permanently) --- diff --git a/.gitignore b/.gitignore index 661253a..3e0e2a0 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,6 @@ /flashrom/ /grub/ /memtest86plus/ -/seabios/ /bin/ /release/ /resources/utilities/ich9deblob/*.rom diff --git a/docs/src/maintain/index.texi b/docs/src/maintain/index.texi index e68adfa..0801121 100644 --- a/docs/src/maintain/index.texi +++ b/docs/src/maintain/index.texi @@ -24,7 +24,6 @@ * Updating flashrom:: * Updating bucts:: * Updating MemTest86+:: -* SeaBIOS:: @end menu @node Maintaining libreboot @@ -67,8 +66,6 @@ This section of the documentation applies mainly to the development version of l @ref{#updating_bucts,Updating bucts} @item @ref{#updating_memtest86plus,Updating MemTest86+} -@item -@ref{#seabios,SeaBIOS} @end itemize Or @uref{../index.html,Back to main index}. @@ -274,34 +271,6 @@ In the download script for memtest86plus, make sure to update the checksum that @ref{#pagetop,Back to top of page}. -@node SeaBIOS -@chapter SeaBIOS -@anchor{#seabios} -Create the SeaBIOS config like so (changed from defaults):@* $ @strong{./build config seabiosmodify} - -@verbatim -General Features -> Build Target -> Build for coreboot (enable) -VGA ROM -> VGA Hardware Type -> coreboot linear framebuffer (enable) -Debugging -> Serial port debugging (enable) -@end verbatim - -When updating SeaBIOS, run the following:@* $ @strong{./build config seabiosupdate}@* (this will run @strong{make oldconfig} on seabios) - -Relevant scripts: - -@itemize -@item -resources/scripts/helpers/build/config/seabiosmodify -@item -resources/scripts/helpers/build/config/seabiosupdate -@item -resources/scripts/helpers/download/seabios (change patches used, revision, etc) -@item -resources/scripts/helpers/build/clean/seabios -@item -resources/scripts/helpers/build/module/seabios -@end itemize - Copyright © 2015 Francis Rowe @* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license can be found at @uref{../resources/licenses/gfdl-1.3.txt,gfdl-1.3.txt} Updated versions of the license (when available) can be found at @uref{https://www.gnu.org/licenses/licenses.html,https://www.gnu.org/licenses/licenses.html} diff --git a/docs/src/tasks.texi b/docs/src/tasks.texi index 2cca411..7fa4a6d 100644 --- a/docs/src/tasks.texi +++ b/docs/src/tasks.texi @@ -208,15 +208,11 @@ Join #debian-reproducible on OFTC IRC. @item merged in master (coreboot) - pay attention to these, especially the fact that the reproducibility relies on git (libreboot uses coreboot without git, and the reason makes this unavoidable): @uref{http://review.coreboot.org/#/c/8616/,http://review.coreboot.org/#/c/8616/} @uref{http://review.coreboot.org/#/c/8617/,http://review.coreboot.org/#/c/8617/} @uref{http://review.coreboot.org/#/c/8618/,http://review.coreboot.org/#/c/8618/} @uref{http://review.coreboot.org/#/c/8619/,http://review.coreboot.org/#/c/8619/} @item -not yet merged in master (coreboot: @uref{http://review.coreboot.org/#/c/10515/,http://review.coreboot.org/#/c/10515/} -- not really relevant yet, but will be in the future. (libreboot currently ignores SeaBIOS) -@item NOTE: see build/release/* commands for coreboot/.coreboot-version in libreboot @item NOTE: GRUB ELF executable (payload) is built reproducibly in libreboot now @item NOTE: MemTest86+ seems to be built reproducibly, but we're not sure. @uref{https://reproducible.debian.net/rb-pkg/testing/amd64/memtest86+.html,this link} -@item -NOTE: SeaBIOS version used is based on 1.8, we need to use the latest version based on 1.9 (or just use 1.9) which is much better according to lynxis @end itemize @end itemize diff --git a/resources/scripts/helpers/build/clean/seabios b/resources/scripts/helpers/build/clean/seabios deleted file mode 100755 index 02c5baf..0000000 --- a/resources/scripts/helpers/build/clean/seabios +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# helper script: clean the dependencies that were built in seabios -# -# Copyright (C) 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 -# 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 . -# - -# This script assumes that the current working directory is the root -# of libreboot_src or libreboot git - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -# clean bucts -# -------------------------------------------------------- - -printf "Cleaning the previous build of seabios\n" - -cd seabios/ -make distclean - -printf "\n\n" - -# done. go back to main directory. -cd ../ - -# ------------------- DONE ---------------------- diff --git a/resources/scripts/helpers/build/config/seabiosmodify b/resources/scripts/helpers/build/config/seabiosmodify deleted file mode 100755 index 750fcad..0000000 --- a/resources/scripts/helpers/build/config/seabiosmodify +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -# -# helper script: update the seabios config -# -# 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 -# 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 . -# - -# This script assumes that the working directory is the root -# of libreboot_src or git - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -cd seabios/ - -if [ -f ../resources/seabios/config/config ]; then - cp ../resources/seabios/config/config .config -fi - -make menuconfig - -mv .config ../resources/seabios/config/config - -cd ../ diff --git a/resources/scripts/helpers/build/config/seabiosupdate b/resources/scripts/helpers/build/config/seabiosupdate deleted file mode 100755 index 160cb53..0000000 --- a/resources/scripts/helpers/build/config/seabiosupdate +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -# -# helper script: update the seabios config -# -# 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 -# 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 . -# - -# This script assumes that the working directory is the root -# of libreboot_src or git - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -cd seabios/ - -if [ -f ../resources/seabios/config/config ]; then - cp ../resources/seabios/config/config .config - make oldconfig - mv .config ../resources/seabios/config/config -fi - -cd ../ diff --git a/resources/scripts/helpers/build/module/seabios b/resources/scripts/helpers/build/module/seabios deleted file mode 100755 index d869c03..0000000 --- a/resources/scripts/helpers/build/module/seabios +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -# helper script: builds SeaBIOS source code -# -# Copyright (C) 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 -# 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 . -# - -# This script assumes that the working directory is the root -# of libreboot_src or git - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -# Build SeaBIOS -# --------------------------------------------------------------------- - -printf "Building SeaBIOS\n" - -cd seabios/ - -cp ../resources/seabios/config/config .config - -# clean it first -[[ -f Makefile ]] && make clean - -# build SeaBIOS -make - -printf "\n\n" - -rm -f .config - -# done. go back to main directory -cd ../ - -# ------------------- DONE ---------------------- diff --git a/resources/scripts/helpers/build/release/src b/resources/scripts/helpers/build/release/src index b2e893a..f2f5b31 100755 --- a/resources/scripts/helpers/build/release/src +++ b/resources/scripts/helpers/build/release/src @@ -82,7 +82,6 @@ rm -Rf "${distdir}/bucts/".git* rm -Rf "${distdir}/flashrom/".git* rm -Rf "${distdir}/grub/".git* rm -Rf "${distdir}/depthcharge/".git* -rm -Rf "${distdir}/seabios/".git* # Delete useless files. rm -Rf "${distdir}/TODO/" diff --git a/resources/scripts/helpers/build/roms/withgrub_helper b/resources/scripts/helpers/build/roms/withgrub_helper index 6dee9a0..530449e 100755 --- a/resources/scripts/helpers/build/roms/withgrub_helper +++ b/resources/scripts/helpers/build/roms/withgrub_helper @@ -101,10 +101,6 @@ do fi fi - # Add SeaBIOS to the image - ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add -f ../seabios/out/bios.bin.elf -n bios.bin.elf -t raw - ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add -f ../seabios/out/vgabios.bin -n vgaroms/vgabios.bin -t raw - # Path to coreinfo payload coreinfo=payloads/coreinfo/build/coreinfo.elf diff --git a/resources/scripts/helpers/download/seabios b/resources/scripts/helpers/download/seabios deleted file mode 100755 index 1fc6ca4..0000000 --- a/resources/scripts/helpers/download/seabios +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash - -# helper script: Downloads SeaBIOS and patches it. -# -# Copyright (C) 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 -# 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 . -# - -# This script assumes that the working directory is the -# root of libreboot_src or libreboot git. - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -# Get SeaBIOS, revert to commit last used and apply patches. - -# Remove the old version that may still exist -# ------------------------------------------------------------------------------ - -printf "Downloading SeaBIOS\n" - -rm -rf seabios - -# Get latest SeaBIOS -# ------------------------------------------------------------------------------ - -# download it using git -git clone git://git.seabios.org/seabios.git seabios - -# modifications are required -cd seabios/ - -# Reset to the last commit that was tested -# ------------------------------------------------------------------------------ - -git reset --hard 948f3c9b5f74f265bd171ee367a632a8f7c81f68 - -# Apply patches -# ------------------------------------------------------------------------------ - -# no patches are used in this revision of libreboot - -cd ../ -printf "\n\n" - -# ------------------- DONE ---------------------- - diff --git a/resources/seabios/config/config b/resources/seabios/config/config deleted file mode 100644 index 48f3bf1..0000000 --- a/resources/seabios/config/config +++ /dev/null @@ -1,95 +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_MULTIBOOT=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_SDCARD=y -CONFIG_MEGASAS=y -CONFIG_FLOPPY=y -CONFIG_FLASH_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_RTC_TIMER=y -CONFIG_HARDWARE_IRQ=y -CONFIG_PMTIMER=y -CONFIG_TSC_TIMER=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 -CONFIG_TCGBIOS=y - -# -# VGA ROM -# -# CONFIG_NO_VGABIOS 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_FIXUP_ASM=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=y -CONFIG_DEBUG_SERIAL_PORT=0x3f8 -CONFIG_DEBUG_COREBOOT=y -- cgit v0.9.1