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

rom.sh: Don't build txtmode U-Boot images 

U-Boot needs a VESA framebuffer or native coreboot
framebuffer to work properly.

Signed-off-by: Leah Rowe <leah@libreboot.org>
master
Leah Rowe 2024-11-21 17:56:50 +00:00 committed by Leah Rowe
parent dea09b8bf5
commit c885a63dd5
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/rom.sh
View File

@ -93,7 +93,6 @@ mkcorebootbin()
initmode="${defconfig##*/}"; displaymode="${initmode##*_}" initmode="${defconfig##*/}"; displaymode="${initmode##*_}"
initmode="${initmode%%_*}" initmode="${initmode%%_*}"
[ -n "$displaymode" ] && displaymode="_$displaymode"
cbfstool="elf/cbfstool/$tree/cbfstool" cbfstool="elf/cbfstool/$tree/cbfstool"
[ "$payload_uboot_i386" = "y" ] && \ [ "$payload_uboot_i386" = "y" ] && \
@ -153,7 +152,8 @@ add_seabios()
[ "$payload_grub" = "y" ] && add_grub [ "$payload_grub" = "y" ] && add_grub
cprom cprom
[ "$payload_uboot_amd64" = "y" ] && pname="seauboot" && cprom "seauboot" [ "$payload_uboot_amd64" = "y" ] && [ "$displaymode" != "txtmode" ] && \
pname="seauboot" && cprom "seauboot"
[ "$payload_grub" = "y" ] && pname="seagrub" && mkseagrub; : [ "$payload_grub" = "y" ] && pname="seagrub" && mkseagrub; :
} }
@ -175,6 +175,11 @@ mkseagrub()
add_uboot() add_uboot()
{ {
if [ "$displaymode" = "txtmode" ]; then
printf "cb/$target: Cannot use U-Boot in text mode\n" 1>&2
return 0
fi
# TODO: re-work to allow each coreboot target to say which ub tree # TODO: re-work to allow each coreboot target to say which ub tree
# instead of hardcoding as in the current logic below: # instead of hardcoding as in the current logic below:
@ -209,7 +214,8 @@ add_uboot()
cprom() cprom()
{ {
newrom="bin/$target/${pname}_${target}_$initmode$displaymode.rom" newrom="bin/$target/${pname}_${target}_$initmode.rom"
[ -n "$displaymode" ] && newrom="${newrom%.rom}_$displaymode.rom"
[ $# -gt 0 ] && [ "$1" != "seauboot" ] && \ [ $# -gt 0 ] && [ "$1" != "seauboot" ] && \
newrom="${newrom%.rom}_${1%.gkb}.rom" newrom="${newrom%.rom}_${1%.gkb}.rom"