roms: simplify build_roms()

Signed-off-by: Leah Rowe <leah@libreboot.org>
audit6
Leah Rowe 2024-06-24 18:24:50 +01:00
parent c9f26dbc94
commit 8af9f904c4
1 changed files with 7 additions and 13 deletions

View File

@ -25,7 +25,7 @@ stm32dir="$stm32src/boards"
# Disable all payloads by default. # Disable all payloads by default.
# target.cfg files have to specifically enable [a] payload(s) # target.cfg files have to specifically enable [a] payload(s)
pv="payload_uboot payload_seabios payload_memtest t payload_grub" pv="payload_uboot payload_seabios payload_memtest t payload_grub"
v="romdir initmode displaymode cbcfg targetdir tree release ubootelf" v="romdir initmode displaymode targetdir tree release ubootelf"
v="$v board grub_scan_disk uboot_config grubtree grubelf tmpmv" v="$v board grub_scan_disk uboot_config grubtree grubelf tmpmv"
eval `setvars "n" $pv` eval `setvars "n" $pv`
eval `setvars "" $v boards targets serdir ser` eval `setvars "" $v boards targets serdir ser`
@ -121,18 +121,12 @@ build_roms()
{ {
x_ rm -Rf "$romdir" x_ rm -Rf "$romdir"
for it in "normal" "vgarom" "libgfxinit"; do for cbcfg in "$targetdir/config/"*; do
initmode="$it"; hmode="vesafb" [ -f "$cbcfg" ] || continue; cn="${cbcfg##*/}"; dt="${cn#*_}" \
[ "$initmode" = "vgarom" ] || hmode="corebootfb" && [ "$dt" = "$cn" ] && dt="txtmode"; displaymode="$dt"
modes="$hmode txtmode" initmode="${cn%%_*}"; chkvars initmode displaymode
for dt in $modes; do e "$cbcfg" f not || add_payloads
displaymode="$dt"; [ "$initmode" = "normal" ] && \ done; x_ rm -f "$tmprom"
[ "$displaymode" != "txtmode" ] && continue
cbcfg="$targetdir/config/${initmode}_$displaymode"
[ "$initmode" = "normal" ] && cbcfg="${cbcfg%_*}"
e "$cbcfg" f not || add_payloads; x_ rm -f "$tmprom"
done
done
} }
add_payloads() add_payloads()