From f5b04fa505d60384fc090682a24438a3e52db640 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 1 Jan 2024 22:11:29 +0000 Subject: build/roms: tidy up payload configuration handling the eval for loop is overkill Signed-off-by: Leah Rowe --- script/build/roms | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'script') diff --git a/script/build/roms b/script/build/roms index 422a1135..a369d0e8 100755 --- a/script/build/roms +++ b/script/build/roms @@ -133,16 +133,14 @@ build_payloads() x_ ./update trees -b memtest86plus [ "$payload_seabios" = "y" ] && x_ ./update trees -b seabios - for bt in grub_payload uboot_payload; do - eval "build_${bt}" - done + if [ "$payload_grub" = "y" ] || [ "$payload_seabios_withgrub" = "y" ] \ + || [ "$payload_seabios_grubonly" = "y" ]; then build_grub_payload + fi + [ "${payload_uboot}" = "y" ] && build_uboot_payload; return 0 } build_grub_payload() { - [ "$payload_grub" != "y" ] && [ "$payload_seabios_withgrub" != "y" ] \ - && [ "${payload_seabios_grubonly}" != "y" ] && return 0 - x_ mkdir -p elf/grub for keymapfile in config/grub/keymap/*.gkb; do @@ -185,8 +183,6 @@ build_grub_payload() build_uboot_payload() { - [ "${payload_uboot}" = "y" ] || return 0 - x_ ./update trees -b u-boot ${board} ubdir="elf/u-boot/${board}/${uboot_config}" ubootelf="${ubdir}/u-boot.elf" -- cgit v1.2.1