Don't use SeaVGABIOS on systems that use SeaGRUB

6 files changed, 38 insertions, 14 deletions

diff --git a/resources/scripts/helpers/build/clean/seabios b/resources/scripts/helpers/build/clean/seabios
index 5ce206a7..0ab0ef29 100755
--- 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
index 08ec50e4..c6841e41 100755
--- 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
index d15a0636..94dfd1db 100755
--- 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
index e43bb0d8..da1b059e 100755
--- 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
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"