diff options
| author | Leah Rowe <info@minifree.org> | 2016-07-17 19:51:53 (EDT) |
|---|---|---|
| committer | Leah Rowe <info@minifree.org> | 2016-07-17 19:51:53 (EDT) |
| commit | e4e705e99ccc934e65b9106db808f681216a2e1f (patch) | |
| tree | 691f6520c4e2af0d4b999139c7dfd7c3157f0970 | |
| parent | 1a3cfd3ca6c59c49349925b25e30f6308c47fb26 (diff) | |
| download | libreboot-e4e705e99ccc934e65b9106db808f681216a2e1f.zip libreboot-e4e705e99ccc934e65b9106db808f681216a2e1f.tar.gz libreboot-e4e705e99ccc934e65b9106db808f681216a2e1f.tar.bz2 | |
Universally enable SeaGRUB on all GRUB boards
| -rwxr-xr-x | resources/scripts/helpers/build/roms/withgrub_helper | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/resources/scripts/helpers/build/roms/withgrub_helper b/resources/scripts/helpers/build/roms/withgrub_helper index 231ea97..e2567a8 100755 --- a/resources/scripts/helpers/build/roms/withgrub_helper +++ b/resources/scripts/helpers/build/roms/withgrub_helper @@ -109,39 +109,29 @@ do make clean mv "config_${romtype}" ".config" cp "../../grub_${romtype}.elf" "grub.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 + # Use SeaGRUB + cp "../../../seabios/out/bios.bin.elf" "payload.elf" make -j${cores} mv "build/coreboot.rom" "${boardtarget}_${romtype}.rom" # We dont need seabios.elf anymore rm -f "payload.elf" - if [ "${boardtarget}" = "macbook21" ] || [ "${boardtarget}" = "x60" ] || [ "${boardtarget}" = "t60" ] || [ "${boardtarget}" = "kcma-d8" ] || [ "${boardtarget}" = "kgpe-d16" ]; then - # These systems use SeaGRUB, which requires additional files: + # Add the grub.elf to CBFS + ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add-payload -c lzma -f grub.elf -n img/grub2 - # Add the grub.elf to CBFS - ./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add-payload -c lzma -f grub.elf -n img/grub2 + # 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 - # 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 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" - # 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 + # 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" # we dont need that grub.elf now rm -f "grub.elf" |