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

vendor.sh: simplify initialisation of variables 

also unify handling of cbutils

Signed-off-by: Leah Rowe <leah@libreboot.org>
audit6
Leah Rowe 2024-06-29 01:19:29 +01:00
parent d63da943c1
commit c764198619
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/vendor.sh
View File

@ -40,11 +40,7 @@ getcfg()
set +u +e; . "$cbcfgfile" 2>/dev/null; set -u -e set +u +e; . "$cbcfgfile" 2>/dev/null; set -u -e
done < "$TMPDIR/vendorcfg.list" done < "$TMPDIR/vendorcfg.list"
cbdir="src/coreboot/$tree" cfgutils
cbfstool="elf/cbfstool/$tree/cbfstool"
mecleaner="$PWD/$cbdir/util/me_cleaner/me_cleaner.py"
kbc1126_ec_dump="$PWD/$cbdir/util/kbc1126/kbc1126_ec_dump"
for c in CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN CONFIG_KBC1126_FIRMWARE \ for c in CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN CONFIG_KBC1126_FIRMWARE \
CONFIG_VGA_BIOS_FILE CONFIG_INCLUDE_SMSC_SCH5545_EC_FW; do CONFIG_VGA_BIOS_FILE CONFIG_INCLUDE_SMSC_SCH5545_EC_FW; do
@ -67,7 +63,6 @@ bootstrap()
[ -n "$MRC_refcode_cbtree" ] && \ [ -n "$MRC_refcode_cbtree" ] && \
cbfstoolref="elf/cbfstool/$MRC_refcode_cbtree/cbfstool" && \ cbfstoolref="elf/cbfstool/$MRC_refcode_cbtree/cbfstool" && \
x_ ./update trees -b coreboot utils $MRC_refcode_cbtree x_ ./update trees -b coreboot utils $MRC_refcode_cbtree
x_ ./update trees -b coreboot utils $tree
} }
getfiles() getfiles()
@ -296,12 +291,20 @@ readcfg()
} }
build_dependencies_inject() build_dependencies_inject()
{
cfgutils
[ "$nukemode" = "nuke" ] || x_ ./vendor download $board; return 0
}
cfgutils()
{ {
cbdir="src/coreboot/$tree" cbdir="src/coreboot/$tree"
cbfstool="elf/cbfstool/$tree/cbfstool" cbfstool="elf/cbfstool/$tree/cbfstool"
mecleaner="$PWD/$cbdir/util/me_cleaner/me_cleaner.py"
kbc1126_ec_dump="$PWD/$cbdir/util/kbc1126/kbc1126_ec_dump"
cbfstool="elf/cbfstool/$tree/cbfstool"
ifdtool="elf/ifdtool/$tree/ifdtool" ifdtool="elf/ifdtool/$tree/ifdtool"
x_ ./update trees -b coreboot utils $tree x_ ./update trees -b coreboot utils $tree
[ "$nukemode" = "nuke" ] || x_ ./vendor download $board; return 0
} }
patch_release_roms() patch_release_roms()