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

roms: simplify build_roms() 

Signed-off-by: Leah Rowe <leah@libreboot.org>
audit2
Leah Rowe 2024-06-24 18:24:50 +01:00 committed by Leah Rowe
parent 0355a80408
commit 14c3a328f1
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
script/roms
View File

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