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

seabios: do normal config, disable oprom in vgarom

Browse Source 
previously, "normal" initmode relied on the vgarom-based
seabios config, which enables option roms, but then lbmk
would insert pci-optionrom-exec 0 for vgarom, and 2 for normal

in libreboot, coreboot roms with "vgarom" in the filename do
pci option rom execution from coreboot, and "normal" roms
do execution from seabios(where seabios is the only payload
provided on normal setups)

this is because payloads like grub can also be used, on vgarom
setups, where coreboot must handle oprom execution
This commit is contained in:
Leah Rowe
2023-05-08 19:45:32 +01:00
parent 450f19bd79
commit 3f1ee01507
4 changed files with 105 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/scripts/build/boot/roms_helper
+4 -10
View File
@@ -217,7 +217,8 @@ fi
if [ ! -f "${seavgabiosrom}" ] \
|| [ ! -f payload/seabios/seabios_libgfxinit.elf ] \
|| [ ! -f payload/seabios/seabios_vgarom.elf ]; then
|| [ ! -f payload/seabios/seabios_vgarom.elf ] \
|| [ ! -f payload/seabios/seabios_normal.elf ]; then
if [ "${payload_seabios}" = "y" ]; then
./build payload seabios
elif [ "${payload_grub}" = "y" ] \
@@ -361,14 +362,7 @@ make_seabios_rom() {
target_opromloadonly="${3}" # 0 or 1. if 1, only load but don't execute oproms
target_initmode="${4}" # e.g. libgfxinit
if [ "${target_initmode}" = "normal" ]; then
target_seabioself="payload/seabios/seabios_vgarom.elf"
# if normal, etc/pci-optionrom-exec will be set to 2
else
target_seabioself="payload/seabios/seabios_${target_initmode}.elf"
# if libgfxinit, etc/pci-optionrom-exec will be set to 2
# if vgarom, etc/pci-optionrom-exec will be set to 0
fi
target_seabioself="payload/seabios/seabios_${target_initmode}.elf"
target_seavgabios_rom="payload/seabios/seavgabios.bin"
tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX)
@@ -378,7 +372,7 @@ make_seabios_rom() {
"${cbfstool}" "${tmprom}" add-int -i 3000 -n etc/ps2-keyboard-spinup || exit 1
if [ "${target_initmode}" = "normal" ] || [ "${target_initmode}" = "libgfxinit" ]; then
"${cbfstool}" "${tmprom}" add-int -i 2 -n etc/pci-optionrom-exec || exit 1
elif [ "${target_initmode}" = "vgarom" ]; then
elif [ "${target_initmode}" = "vgarom" ]; then # coreboot executes the rom
"${cbfstool}" "${tmprom}" add-int -i 0 -n etc/pci-optionrom-exec || exit 1
fi # for undefined modes, don't add this integer. rely on SeaBIOS defaults
"${cbfstool}" "${tmprom}" add-int -i 0 -n etc/optionroms-checksum || exit 1
resources/scripts/build/payload/seabios
+9 -1
View File
@@ -2,7 +2,7 @@
# helper script: builds SeaBIOS source code
#
# Copyright (C) 2020, 2021 Leah Rowe <info@minifree.org>
# Copyright (C) 2020, 2021, 2023 Leah Rowe <info@minifree.org>
# Copyright (C) 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
#
# This program is free software: you can redistribute it and/or modify
@@ -55,6 +55,14 @@ make -j$(nproc)
mv out/bios.bin.elf ../payload/seabios/seabios_vgarom.elf
rm .config
# for normal setup:
[ -f Makefile ] && make distclean
cp ../resources/seabios/config/normal .config
make silentoldconfig -j$(nproc)
make -j$(nproc)
mv out/bios.bin.elf ../payload/seabios/seabios_normal.elf
rm .config
# clean it again. gotta keep it clean!
[ -f Makefile ] && make distclean