summaryrefslogtreecommitdiff
path: root/script
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2024-06-20 01:15:06 +0100
committerLeah Rowe <leah@libreboot.org>2024-06-20 01:15:06 +0100
commit808458ced5bcc5131d542e7e2fcb8120a613c8eb (patch)
tree395156e0d4d2658e0184c2a29077b39e579f8c82 /script
parent4ab99d546e4b67e0394a2bb34c004c46d16ff893 (diff)
minor code cleanup in the build system
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'script')
-rwxr-xr-xscript/roms5
-rwxr-xr-xscript/trees3
2 files changed, 3 insertions, 5 deletions
diff --git a/script/roms b/script/roms
index bc124734..2f90653f 100755
--- a/script/roms
+++ b/script/roms
@@ -166,9 +166,8 @@ build_roms()
cbfs "$cbrom" "elf/memtest86plus/memtest.bin" img/memtest
[ "$payload_seabios" = "y" ] && build_seabios_roms
[ "$payload_grub" != "y" ] || build_grub_roms "$cbrom" "grub"
- [ "$payload_uboot" = "y" ] || return 0
- x_ cp "$_cbrom" "$cbrom"
- build_uboot_roms
+ [ "$payload_uboot" = "y" ] && x_ cp "$_cbrom" "$cbrom" && \
+ build_uboot_roms; return 0
}
build_seabios_roms()
diff --git a/script/trees b/script/trees
index 13f6d652..78ffaed8 100755
--- a/script/trees
+++ b/script/trees
@@ -229,8 +229,7 @@ handle_makefile()
run_make_command()
{
- check_cmake "$cdir"
- [ -z "$mode" ] && check_autoconf "$cdir"
+ check_cmake "$cdir" && [ -z "$mode" ] && check_autoconf "$cdir"
check_makefile "$cdir" || return 1
[ "$project" = "coreboot" ] && [ -z "$mode" ] && x_ \