Revert "Universally enable SeaGRUB on all GRUB boards"

This reverts commit e4e705e99ccc934e65b9106db808f681216a2e1f.

1 files changed, 24 insertions, 14 deletions

diff --git a/resources/scripts/helpers/build/roms/withgrub_helper b/resources/scripts/helpers/build/roms/withgrub_helper
index 96fdc9d5..93106bbe 100755
--- a/resources/scripts/helpers/build/roms/withgrub_helper
+++ b/resources/scripts/helpers/build/roms/withgrub_helper
@@ -100,29 +100,39 @@ do
 	make clean
 	mv "config_${romtype}" ".config"
 	cp "../../grub_${romtype}.elf" "grub.elf"
-    # Use SeaGRUB
-    cp "../../../seabios/out/bios.bin.elf" "payload.elf"
+    if [ "${boardtarget}" = "macbook21" ] || [ "${boardtarget}" = "x60" ] || [ "${boardtarget}" = "t60" ] || [ "${boardtarget}" = "kcma-d8" ] || [ "${boardtarget}" = "kgpe-d16" ]; then
+        # Use SeaGRUB
+        cp "../../../seabios/out/bios.bin.elf" "payload.elf"
+    else
+        # Use GRUB
+        cp grub.elf payload.elf 
+    fi
 	make -j${cores}
 	mv "build/coreboot.rom" "${boardtarget}_${romtype}.rom"
 
     # We dont need seabios.elf anymore
     rm -f "payload.elf"
 
-    # Add the grub.elf to CBFS
-    ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add-payload -c lzma -f grub.elf -n img/grub2
+    if [ "${boardtarget}" = "macbook21" ] || [ "${boardtarget}" = "x60" ] || [ "${boardtarget}" = "t60" ] || [ "${boardtarget}" = "kcma-d8" ] || [ "${boardtarget}" = "kgpe-d16" ]; then
+        # These systems use SeaGRUB, which requires additional files:
 
-    # Set bootorder so that seabios loads grub by default
-    printf "/rom@img/grub2\n" > bootorder
-    ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add -f bootorder -n bootorder -t raw
-    rm -f bootorder
+        # Add the grub.elf to CBFS
+        ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add-payload -c lzma -f grub.elf -n img/grub2
 
-    # Add 0s delay to seabios, so that the user is not burdened by seeing
-    # that horrible interface that seabios has
-    ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add-int -i 0 -n etc/show-boot-menu || "already exists"
+        # Set bootorder so that seabios loads grub by default
+        printf "/rom@img/grub2\n" > bootorder
+        ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add -f bootorder -n bootorder -t raw
+        rm -f bootorder
 
-    # 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 3000 -n etc/ps2-keyboard-spinup || printf "already exists"
+        # Add 0s delay to seabios, so that the user is not burdened by seeing
+        # that horrible interface that seabios has
+        ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add-int -i 0 -n etc/show-boot-menu || "already exists"
+
+        # 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 3000 -n etc/ps2-keyboard-spinup || printf "already exists"
+
+    fi
 
     # we dont need that grub.elf now
     rm -f "grub.elf"