From 808458ced5bcc5131d542e7e2fcb8120a613c8eb Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Thu, 20 Jun 2024 01:15:06 +0100 Subject: minor code cleanup in the build system Signed-off-by: Leah Rowe --- script/roms | 5 ++--- script/trees | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'script') 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_ \ -- cgit v1.2.1