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

remove more unnecessary checks on trees commands 

the trees script already performs these checks

Signed-off-by: Leah Rowe <leah@libreboot.org>
audit2
Leah Rowe 2024-06-28 14:51:32 +01:00 committed by Leah Rowe
parent 0dcd8852dd
commit 57b68302c7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
script/roms
View File

@ -102,7 +102,7 @@ configure_target()
x_ ./update trees -b coreboot $board x_ ./update trees -b coreboot $board
cbfstool="elf/cbfstool/$tree/cbfstool" cbfstool="elf/cbfstool/$tree/cbfstool"
[ -f "$cbfstool" ] || x_ ./update trees -b coreboot utils $tree x_ ./update trees -b coreboot utils $tree
[ -n "$uboot_config" ] || uboot_config="default" [ -n "$uboot_config" ] || uboot_config="default"
[ "$payload_uboot" = "y" ] || payload_seabios="y" [ "$payload_uboot" = "y" ] || payload_seabios="y"
@ -143,7 +143,7 @@ add_payloads()
# add u-boot payload # add u-boot payload
ubdir="elf/u-boot/$board/$uboot_config"; ubootelf="$ubdir/u-boot.elf" \ ubdir="elf/u-boot/$board/$uboot_config"; ubootelf="$ubdir/u-boot.elf" \
&& [ ! -f "$ubootelf" ] && ubootelf="$ubdir/u-boot" && [ ! -f "$ubootelf" ] && ubootelf="$ubdir/u-boot"
[ -f "$ubootelf" ] || x_ ./update trees -b u-boot $board x_ ./update trees -b u-boot $board
[ -f "$ubootelf" ] || $err "$board: Can't find u-boot" [ -f "$ubootelf" ] || $err "$board: Can't find u-boot"
cbfs "$tmprom" "$ubootelf" "fallback/payload" cbfs "$tmprom" "$ubootelf" "fallback/payload"

2
script/trees
View File

@ -69,7 +69,7 @@ build_project()
[ ! -f "$listfile" ] || elfcheck || return 0 [ ! -f "$listfile" ] || elfcheck || return 0
cdir="src/${project}" cdir="src/${project}"
[ -d "$cdir" ] || x_ ./update trees -f "$project" x_ ./update trees -f "$project"
[ "$mode" = "distclean" ] && mode="clean" [ "$mode" = "distclean" ] && mode="clean"
run_make_command || return 0 run_make_command || return 0