libreboot
/
lbmk
1
0
Fork 0
Code Packages Projects Releases Activity

dell3050micro: make GRUB the primary payload 

SeaBIOS is known to hang on this board. It is being investigated.

Add two variable options for target.cfg files:

* seabiosname
* grubname

This string defines where it would be located in CBFS.

Signed-off-by: Leah Rowe <leah@libreboot.org>
m920qwip
Leah Rowe 2024-10-06 09:21:08 +01:00
parent ed8178e83b
commit c99dced5b1
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/coreboot/dell3050micro_fsp_16mb/target.cfg
View File

@ -8,3 +8,5 @@ grubtree="xhci"
vcfg="3050micro" vcfg="3050micro"
build_depend="seabios/default grub/xhci memtest86plus" build_depend="seabios/default grub/xhci memtest86plus"
IFD_platform="sklkbl" IFD_platform="sklkbl"
grubname="fallback/payload" # make GRUB the primary payload on this board
seabiosname="seabios.elf" # seabios is known to hang on this board

6
include/rom.sh
View File

@ -118,9 +118,10 @@ mkcorebootbin()
add_seabios() add_seabios()
{ {
[ -n "$seabiosname" ] || seabiosname="fallback/payload"
_seabioself="elf/seabios/default/$initmode/bios.bin.elf" _seabioself="elf/seabios/default/$initmode/bios.bin.elf"
cbfs "$tmprom" "$_seabioself" "fallback/payload" cbfs "$tmprom" "$_seabioself" "$seabiosname"
x_ "$cbfstool" "$tmprom" add-int -i 3000 -n etc/ps2-keyboard-spinup x_ "$cbfstool" "$tmprom" add-int -i 3000 -n etc/ps2-keyboard-spinup
_z="2"; [ "$initmode" = "vgarom" ] && _z="0" _z="2"; [ "$initmode" = "vgarom" ] && _z="0"
@ -139,7 +140,8 @@ add_seabios()
add_grub() add_grub()
{ {
cbfs "$tmprom" "$grubelf" "img/grub2" [ -n "$grubname" ] || grubname="img/grub2"
cbfs "$tmprom" "$grubelf" "$grubname"
printf "set grub_scan_disk=\"%s\"\n" "$grub_scan_disk" \ printf "set grub_scan_disk=\"%s\"\n" "$grub_scan_disk" \
> "$TMPDIR/tmpcfg" || $err "$target: !insert scandisk" > "$TMPDIR/tmpcfg" || $err "$target: !insert scandisk"
cbfs "$tmprom" "$TMPDIR/tmpcfg" scan.cfg raw cbfs "$tmprom" "$TMPDIR/tmpcfg" scan.cfg raw

5
script/trees
View File

@ -12,7 +12,8 @@ set -u -e
eval `setvars "" xarch srcdir premake cmakedir xlang mode makeargs elfdir cmd \ eval `setvars "" xarch srcdir premake cmakedir xlang mode makeargs elfdir cmd \
project target target_dir targets xtree _f release bootstrapargs mkhelper \ project target target_dir targets xtree _f release bootstrapargs mkhelper \
autoconfargs listfile autogenargs btype tree rev tree_depend build_depend \ autoconfargs listfile autogenargs btype tree rev tree_depend build_depend \
defconfig postmake mkhelpercfg dry dest_dir mdir cleanargs`; badhash="n" defconfig postmake mkhelpercfg dry dest_dir mdir cleanargs seabiosname \
grubname`; badhash="n"
main() main()
{ {
@ -112,7 +113,7 @@ configure_project()
{ {
eval `setvars "" xarch xlang build_depend autoconfargs xtree postmake \ eval `setvars "" xarch xlang build_depend autoconfargs xtree postmake \
tree_depend makeargs btype mkhelper bootstrapargs premake release \ tree_depend makeargs btype mkhelper bootstrapargs premake release \
cleanargs` cleanargs grubname seabiosname`
_tcfg="$1/target.cfg"; badhash="n"; [ -f "$_tcfg" ] || btype="auto" _tcfg="$1/target.cfg"; badhash="n"; [ -f "$_tcfg" ] || btype="auto"
[ -f "$datadir/mkhelper.cfg" ] && eval `setcfg "$datadir/mkhelper.cfg"` [ -f "$datadir/mkhelper.cfg" ] && eval `setcfg "$datadir/mkhelper.cfg"`