canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rom.sh: disable seabios-as-primary if grub is main 

the way it worked, the roms were still named seagrub
and the seabios rom would be compiled, but with the wrong
path, so seabios wouldn't be executed; seabios would hang
anyway, on this board.

instead, engineer it in such a way as to disable seabios_
images on such setups. also, rename seagrub_ to grub_.

i normally only permit seagrub, and not grub, but i make an
exception for 3050micro because we know grub works, but seabios
currently hangs on this board (which means no bsd).

dell optiplex 3050 micro isn't actually supported in canoeboot,
but the workaround patch for enabling grub as primary payload
was added so that cbmk will maintain parity with lbmk.

Signed-off-by: Leah Rowe <leah@libreboot.org>
master
Leah Rowe 2024-10-06 10:31:36 +01:00 committed by Leah Rowe
parent b6036e81d2
commit 03f7a7b53a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/rom.sh
View File

@ -133,7 +133,8 @@ add_seabios()
[ "$payload_grub" = "y" ] && add_grub [ "$payload_grub" = "y" ] && add_grub
cprom && [ "$payload_grub" = "y" ] && pname="seagrub" && mkseagrub; : [ "$seabiosname" = "fallback/payload" ] && cprom
[ "$payload_grub" = "y" ] && pname="seagrub" && mkseagrub; :
} }
add_grub() add_grub()
@ -147,6 +148,7 @@ add_grub()
mkseagrub() mkseagrub()
{ {
[ "$grubname" = "fallback/payload" ] && pname="grub"
cbfs "$tmprom" "$grubdata/bootorder" bootorder raw cbfs "$tmprom" "$grubdata/bootorder" bootorder raw
for keymap in config/data/grub/keymap/*.gkb; do for keymap in config/data/grub/keymap/*.gkb; do
[ -f "$keymap" ] && cprom "${keymap##*/}"; : [ -f "$keymap" ] && cprom "${keymap##*/}"; :