[PATCH 14/20] build/boot/roms: support "normal" seabios configs

[Leah Rowe]

From: Leah Rowe <leah@libreboot.org>

in the "normal" setup, seabios loads a vga option rom and
coreboot provides no video initialisation (native or vgarom).
this would be used if GNU Boot were to add support for a
desktop computer that lacks onboard graphics.

with this patch, that use-case is handled properly, matching
the same behaviour in canoeboot's build system as of
canoeboot 20231103.

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 resources/packages/roms_helper/boot | 4 ++--
 resources/packages/seabios/payload  | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/resources/packages/roms_helper/boot 
b/resources/packages/roms_helper/boot
index 1e6e311..84f0555 100755
--- a/resources/packages/roms_helper/boot
+++ b/resources/packages/roms_helper/boot
@@ -254,7 +254,7 @@ make_seabios_rom() {
        cbfstool_path="${5}"
 
        if [ "${target_initmode}" = "normal" ]; then
-               target_seabioself="payload/seabios/seabios_vgarom.elf"
+               target_seabioself="payload/seabios/seabios_normal.elf"
                # if normal, etc/pci-optionrom-exec will be set to 2
        else
                
target_seabioself="payload/seabios/seabios_${target_initmode}.elf"
@@ -335,7 +335,7 @@ mkRomsWithGrub() {
 
        if [ "${payload_grub_withseabios}" = "y" ] && [ "${firstpayloadname}" = 
"grub" ]; then
                mv "$(make_seabios_rom "${tmprompath}" "seabios.elf" 
"${seabios_opromloadonly}" "${initmode}" "${cbfstool}")" "${tmprompath}"
-       elif [ "${payload_seabios_withgrub}" ] && [ "${firstpayloadname}" != 
"grub" ]; then
+       elif [ "${payload_seabios_withgrub}" = "y" ] && [ "${firstpayloadname}" 
!= "grub" ]; then
                mv "$(make_seabios_rom "${tmprompath}" "fallback/payload" 
"${seabios_opromloadonly}" "${initmode}" "${cbfstool}")" "${tmprompath}"
                if [ "${firstpayloadname}" = "seabios_grubfirst" ]; then
                        tmpbootorder=$(mktemp -t coreboot_rom.XXXXXXXXXX)
diff --git a/resources/packages/seabios/payload 
b/resources/packages/seabios/payload
index 9120bff..92f06b5 100755
--- a/resources/packages/seabios/payload
+++ b/resources/packages/seabios/payload
@@ -54,6 +54,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
 
-- 
2.39.2