libreboot

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README

commit b1ff016f3f422c47b5c65a4d3ebfc449f1fd5743
parent 870be408e848aa884f8bcc6c2213cb31e4cd2615
Author: Leah Woods <info@minifree.org>
Date:   Fri, 20 May 2016 03:25:09 +0100

Don't use SeaVGABIOS on systems that use SeaGRUB

Diffstat:
resources/scripts/helpers/build/clean/seabios | 1+
resources/scripts/helpers/build/config/seabiosmodify | 17++++++++++++-----
resources/scripts/helpers/build/config/seabiosupdate | 17++++++++++++-----
resources/scripts/helpers/build/module/seabios | 12++++++++++++
resources/scripts/helpers/build/roms/withgrub_helper | 3---
resources/scripts/helpers/build/roms/withseabios_helper | 2+-
resources/seabios/config/config | 10+++-------
resources/seabios/config/config_vga | 94+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
8 files changed, 135 insertions(+), 21 deletions(-)

diff --git a/resources/scripts/helpers/build/clean/seabios b/resources/scripts/helpers/build/clean/seabios @@ -31,6 +31,7 @@ printf "Cleaning the previous build of seabios\n" ( cd "seabios/" +rm -f "out/bios.bin.vga.elf" make distclean ) diff --git a/resources/scripts/helpers/build/config/seabiosmodify b/resources/scripts/helpers/build/config/seabiosmodify @@ -28,11 +28,18 @@ set -u -e ( cd "seabios/" -if [ -f "../resources/seabios/config/config" ]; then - cp "../resources/seabios/config/config" ".config" -fi +for cfgtype in config config_vga; do -make menuconfig + printf "doing config %s\n" "${cfgtype}" + sleep 2 -mv ".config" "../resources/seabios/config/config" + if [ -f "../resources/seabios/config/${cfgtype}" ]; then + cp "../resources/seabios/config/${cfgtype}" ".config" + fi + + make menuconfig + + mv ".config" "../resources/seabios/config/${cfgtype}" + +done ) diff --git a/resources/scripts/helpers/build/config/seabiosupdate b/resources/scripts/helpers/build/config/seabiosupdate @@ -28,9 +28,16 @@ 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 +for cfgtype in config config_vga; do + + printf "doing config %s\n" "${cfgtype}" + sleep 2 + + if [ -f ../resources/seabios/config/${cfgtype} ]; then + cp ../resources/seabios/config/${cfgtype} .config + make oldconfig + mv .config ../resources/seabios/config/${cfgtype} + fi + +done ) diff --git a/resources/scripts/helpers/build/module/seabios b/resources/scripts/helpers/build/module/seabios @@ -39,10 +39,22 @@ cp ../resources/seabios/config/config .config # build SeaBIOS make +mv "out/bios.bin.elf" ../ + printf "\n\n" rm -f .config +make distclean + +cp ../resources/seabios/config/config_vga .config + +make +rm -f .config + +mv out/bios.bin.elf out/bios.bin.vga.elf +mv ../bios.bin.elf out/ + # done. go back to main directory cd ../ diff --git a/resources/scripts/helpers/build/roms/withgrub_helper b/resources/scripts/helpers/build/roms/withgrub_helper @@ -134,9 +134,6 @@ do ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add -f zero -n etc/show-boot-menu -t raw rm -f zero - # SeaVGABIOS stuff - ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add -f ../../../seabios/out/vgabios.bin -n vgaroms/vgabios.bin -t raw - # keyboard spinup timeout ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" remove -n etc/ps2-keyboard-spinup || printf "does not exist" ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add-int -i 60000 -n etc/ps2-keyboard-spinup || printf "already exists" diff --git a/resources/scripts/helpers/build/roms/withseabios_helper b/resources/scripts/helpers/build/roms/withseabios_helper @@ -98,7 +98,7 @@ do # Build coreboot ROM image make clean - cp "../../../seabios/out/bios.bin.elf" "seabios.elf" + cp "../../../seabios/out/bios.bin.vga.elf" "seabios.elf" mv "config_${romtype}" .config make -j${cores} rm -f "seabios.elf" diff --git a/resources/seabios/config/config b/resources/seabios/config/config @@ -75,16 +75,12 @@ CONFIG_TCGBIOS=y # # VGA ROM # -# CONFIG_NO_VGABIOS is not set +CONFIG_NO_VGABIOS=y # 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_COREBOOT is not set +# CONFIG_BUILD_VGABIOS is not set CONFIG_VGA_EXTRA_STACK_SIZE=512 -CONFIG_VGA_VBE=y # # Debugging diff --git a/resources/seabios/config/config_vga b/resources/seabios/config/config_vga @@ -0,0 +1,94 @@ +# +# 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 is not set +CONFIG_DEBUG_COREBOOT=y