coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-16 23:08:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Only boot 32-bit u-boot from grub, 64 from seabios

Browse Source 
For some reason, 32-bit U-Boot only works when executed from
GRUB, but not SeaBIOS; 64-bit U-Boot only works from SeaBIOS!

This will have to be investigated. Standalone U-Boot, where
U-Boot is the primary payload, has not yet been tested in
Libreboot, and will not be provided for some time due to
stability concerns. More testing is needed!

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2024-11-20 01:19:27 +00:00
parent 279e69172f
commit eb14a176bc
4 changed files with 56 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/grub/default/config/payload
+18 -4
View File
@@ -216,24 +216,38 @@ menuentry 'Load test configuration (grubtest.cfg) inside of CBFS [t]' --hotkey=
fi
}
fi
if [ -f (cbfsdisk)/img/u-boot ]; then
menuentry 'Experimental U-Boot UEFI payload (try from SeaBIOS ESC menu if GRUB fails) [u]' --hotkey='u' {
if [ -f (cbfsdisk)/u-boot ]; then
menuentry 'U-Boot i386 payload (experimental) [u]' --hotkey='u' {
set root='cbfsdisk'
chainloader /img/u-boot
chainloader /u-boot
}
fi
if [ -f (cbfsdisk)/seabios.elf ]; then
menuentry 'Load SeaBIOS (payload) [b]' --hotkey='b' {
if [ -f (cbfsdisk)/img/u-boot ]; then
menuentry 'Load SeaBIOS (U-Boot UEFI available in the ESC menu) [b]' --hotkey='b' {
set root='cbfsdisk'
chainloader /seabios.elf
}
else
menuentry 'Load SeaBIOS [b]' --hotkey='b' {
set root='cbfsdisk'
chainloader /seabios.elf
}
fi
fi
if [ -f (cbfsdisk)/img/grub2 ]; then
if [ -f (cbfsdisk)/img/u-boot ]; then
menuentry 'Return to SeaBIOS (U-Boot UEFI available in the ESC menu) [b]' --hotkey='b' {
set root='cbfsdisk'
chainloader /fallback/payload
}
else
menuentry 'Return to SeaBIOS [b]' --hotkey='b' {
set root='cbfsdisk'
chainloader /fallback/payload
}
fi
fi
menuentry 'Poweroff [p]' --hotkey='p' {
halt
}
config/grub/nvme/config/payload
+18 -4
View File
@@ -234,24 +234,38 @@ menuentry 'Load test configuration (grubtest.cfg) inside of CBFS [t]' --hotkey=
fi
}
fi
if [ -f (cbfsdisk)/img/u-boot ]; then
menuentry 'Experimental U-Boot UEFI payload (try from SeaBIOS ESC menu if GRUB fails) [u]' --hotkey='u' {
if [ -f (cbfsdisk)/u-boot ]; then
menuentry 'U-Boot i386 payload (experimental) [u]' --hotkey='u' {
set root='cbfsdisk'
chainloader /img/u-boot
chainloader /u-boot
}
fi
if [ -f (cbfsdisk)/seabios.elf ]; then
menuentry 'Load SeaBIOS (payload) [b]' --hotkey='b' {
if [ -f (cbfsdisk)/img/u-boot ]; then
menuentry 'Load SeaBIOS (U-Boot UEFI available in the ESC menu) [b]' --hotkey='b' {
set root='cbfsdisk'
chainloader /seabios.elf
}
else
menuentry 'Load SeaBIOS [b]' --hotkey='b' {
set root='cbfsdisk'
chainloader /seabios.elf
}
fi
fi
if [ -f (cbfsdisk)/img/grub2 ]; then
if [ -f (cbfsdisk)/img/u-boot ]; then
menuentry 'Return to SeaBIOS (U-Boot UEFI available in the ESC menu) [b]' --hotkey='b' {
set root='cbfsdisk'
chainloader /fallback/payload
}
else
menuentry 'Return to SeaBIOS [b]' --hotkey='b' {
set root='cbfsdisk'
chainloader /fallback/payload
}
fi
fi
menuentry 'Poweroff [p]' --hotkey='p' {
halt
}
config/grub/xhci/config/payload
+18 -4
View File
@@ -235,24 +235,38 @@ menuentry 'Load test configuration (grubtest.cfg) in CBFS [t]' --hotkey='t' {
fi
}
fi
if [ -f (cbfsdisk)/img/u-boot ]; then
menuentry 'Experimental U-Boot UEFI payload (try from SeaBIOS ESC menu if GRUB fails) [u]' --hotkey='u' {
if [ -f (cbfsdisk)/u-boot ]; then
menuentry 'U-Boot i386 payload (experimental) [u]' --hotkey='u' {
set root='cbfsdisk'
chainloader /img/u-boot
chainloader /u-boot
}
fi
if [ -f (cbfsdisk)/seabios.elf ]; then
menuentry 'Load SeaBIOS (payload) [b]' --hotkey='b' {
if [ -f (cbfsdisk)/img/u-boot ]; then
menuentry 'Load SeaBIOS (U-Boot UEFI available in the ESC menu) [b]' --hotkey='b' {
set root='cbfsdisk'
chainloader /seabios.elf
}
else
menuentry 'Load SeaBIOS [b]' --hotkey='b' {
set root='cbfsdisk'
chainloader /seabios.elf
}
fi
fi
if [ -f (cbfsdisk)/img/grub2 ]; then
if [ -f (cbfsdisk)/img/u-boot ]; then
menuentry 'Return to SeaBIOS (U-Boot UEFI available in the ESC menu) [b]' --hotkey='b' {
set root='cbfsdisk'
chainloader /fallback/payload
}
else
menuentry 'Return to SeaBIOS [b]' --hotkey='b' {
set root='cbfsdisk'
chainloader /fallback/payload
}
fi
fi
menuentry 'Poweroff [p]' --hotkey='p' {
halt
}