diff options
author | Leah Rowe <leah@libreboot.org> | 2024-10-27 19:29:26 +0000 |
---|---|---|
committer | Leah Rowe <leah@libreboot.org> | 2024-10-27 19:32:36 +0000 |
commit | 9bdec645a30ff81abb3f6d3db6c974bf6ab6321f (patch) | |
tree | 0ff9fb81306251f9105493278fa053f686abe98d | |
parent | 6c78942290df512b6ee922ca408404f57e3bb8c2 (diff) |
3050micro: Re-enable SeaGRUB
Remove what is now unnecessary bloat, for ensuring that
GRUB is the primary payload; SeaGRUB is the only preference,
as per lbmk design.
The SeaBIOS hanging issue was fixed, so SeaGRUB is OK now.
Signed-off-by: Leah Rowe <leah@libreboot.org>
-rw-r--r-- | config/coreboot/dell3050micro_fsp_16mb/target.cfg | 2 | ||||
-rw-r--r-- | include/rom.sh | 10 | ||||
-rwxr-xr-x | script/trees | 5 |
3 files changed, 5 insertions, 12 deletions
diff --git a/config/coreboot/dell3050micro_fsp_16mb/target.cfg b/config/coreboot/dell3050micro_fsp_16mb/target.cfg index b45300e9..539c0fb5 100644 --- a/config/coreboot/dell3050micro_fsp_16mb/target.cfg +++ b/config/coreboot/dell3050micro_fsp_16mb/target.cfg @@ -8,5 +8,3 @@ grubtree="xhci" vcfg="3050micro" build_depend="seabios/default grub/xhci memtest86plus" IFD_platform="sklkbl" -grubname="fallback/payload" # make GRUB the primary payload on this board -seabiosname="seabios.elf" diff --git a/include/rom.sh b/include/rom.sh index 9d11e757..1d7be098 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -122,10 +122,9 @@ mkcorebootbin() add_seabios() { - [ -n "$seabiosname" ] || seabiosname="fallback/payload" _seabioself="elf/seabios/default/$initmode/bios.bin.elf" - cbfs "$tmprom" "$_seabioself" "$seabiosname" + cbfs "$tmprom" "$_seabioself" "fallback/payload" x_ "$cbfstool" "$tmprom" add-int -i 3000 -n etc/ps2-keyboard-spinup _z="2"; [ "$initmode" = "vgarom" ] && _z="0" @@ -139,14 +138,12 @@ add_seabios() [ "$payload_grub" = "y" ] && add_grub - [ "$seabiosname" = "fallback/payload" ] && cprom - [ "$payload_grub" = "y" ] && pname="seagrub" && mkseagrub; : + cprom && [ "$payload_grub" = "y" ] && pname="seagrub" && mkseagrub; : } add_grub() { - [ -n "$grubname" ] || grubname="img/grub2" - cbfs "$tmprom" "$grubelf" "$grubname" + cbfs "$tmprom" "$grubelf" "img/grub2" printf "set grub_scan_disk=\"%s\"\n" "$grub_scan_disk" \ > "$TMPDIR/tmpcfg" || $err "$target: !insert scandisk" cbfs "$tmprom" "$TMPDIR/tmpcfg" scan.cfg raw @@ -154,7 +151,6 @@ add_grub() mkseagrub() { - [ "$grubname" = "fallback/payload" ] && pname="grub" cbfs "$tmprom" "$grubdata/bootorder" bootorder raw for keymap in config/data/grub/keymap/*.gkb; do [ -f "$keymap" ] && cprom "${keymap##*/}"; : diff --git a/script/trees b/script/trees index e219d649..5be43dcc 100755 --- a/script/trees +++ b/script/trees @@ -12,8 +12,7 @@ set -u -e eval `setvars "" xarch srcdir premake cmakedir xlang mode makeargs elfdir cmd \ project target target_dir targets xtree _f release bootstrapargs mkhelper \ autoconfargs listfile autogenargs btype tree rev tree_depend build_depend \ - defconfig postmake mkhelpercfg dry dest_dir mdir cleanargs seabiosname \ - grubname`; badhash="n" + defconfig postmake mkhelpercfg dry dest_dir mdir cleanargs`; badhash="n" main() { @@ -113,7 +112,7 @@ configure_project() { eval `setvars "" xarch xlang build_depend autoconfargs xtree postmake \ tree_depend makeargs btype mkhelper bootstrapargs premake release \ - cleanargs grubname seabiosname` + cleanargs` _tcfg="$1/target.cfg"; badhash="n"; [ -f "$_tcfg" ] || btype="auto" [ -f "$datadir/mkhelper.cfg" ] && eval `setcfg "$datadir/mkhelper.cfg"` |