From b1ff016f3f422c47b5c65a4d3ebfc449f1fd5743 Mon Sep 17 00:00:00 2001 From: Leah Woods Date: Fri, 20 May 2016 03:25:09 +0100 Subject: Don't use SeaVGABIOS on systems that use SeaGRUB --- resources/scripts/helpers/build/roms/withgrub_helper | 3 --- resources/scripts/helpers/build/roms/withseabios_helper | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'resources/scripts/helpers/build/roms') diff --git a/resources/scripts/helpers/build/roms/withgrub_helper b/resources/scripts/helpers/build/roms/withgrub_helper index 9ef67ff7..19c01034 100755 --- 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 index 300c3340..f710051a 100755 --- 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" -- cgit v1.2.3-70-g09d2