libreboot
/
lbmk
1
0
Fork 0
Code Packages Projects Releases Activity

build/roms: tidy up payload configuration handling 

the eval for loop is overkill

Signed-off-by: Leah Rowe <leah@libreboot.org>
9020vga
Leah Rowe 2024-01-01 22:11:29 +00:00
parent 0b08121829
commit f5b04fa505
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
script/build/roms
View File

@ -133,16 +133,14 @@ build_payloads()
x_ ./update trees -b memtest86plus x_ ./update trees -b memtest86plus
[ "$payload_seabios" = "y" ] && x_ ./update trees -b seabios [ "$payload_seabios" = "y" ] && x_ ./update trees -b seabios
for bt in grub_payload uboot_payload; do if [ "$payload_grub" = "y" ] || [ "$payload_seabios_withgrub" = "y" ] \
eval "build_${bt}" || [ "$payload_seabios_grubonly" = "y" ]; then build_grub_payload
done fi
[ "${payload_uboot}" = "y" ] && build_uboot_payload; return 0
} }
build_grub_payload() build_grub_payload()
{ {
[ "$payload_grub" != "y" ] && [ "$payload_seabios_withgrub" != "y" ] \
&& [ "${payload_seabios_grubonly}" != "y" ] && return 0
x_ mkdir -p elf/grub x_ mkdir -p elf/grub
for keymapfile in config/grub/keymap/*.gkb; do for keymapfile in config/grub/keymap/*.gkb; do
@ -185,8 +183,6 @@ build_grub_payload()
build_uboot_payload() build_uboot_payload()
{ {
[ "${payload_uboot}" = "y" ] || return 0
x_ ./update trees -b u-boot ${board} x_ ./update trees -b u-boot ${board}
ubdir="elf/u-boot/${board}/${uboot_config}" ubdir="elf/u-boot/${board}/${uboot_config}"
ubootelf="${ubdir}/u-boot.elf" ubootelf="${ubdir}/u-boot.elf"