summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2024-06-29 01:19:29 +0100
committerLeah Rowe <leah@libreboot.org>2024-06-29 01:19:29 +0100
commitc76419861916f63b9fa5240f6886fd9d3ef7f399 (patch)
tree1453efeaf6344cddedf703d212d4c83aeb6357b3 /include
parentd63da943c18d73fe1f944deb44fd97db74783a21 (diff)
vendor.sh: simplify initialisation of variables
also unify handling of cbutils Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include')
-rwxr-xr-xinclude/vendor.sh17
1 files changed, 10 insertions, 7 deletions
diff --git a/include/vendor.sh b/include/vendor.sh
index 62331ac5..d4648074 100755
--- a/include/vendor.sh
+++ b/include/vendor.sh
@@ -40,11 +40,7 @@ getcfg()
set +u +e; . "$cbcfgfile" 2>/dev/null; set -u -e
done < "$TMPDIR/vendorcfg.list"
- cbdir="src/coreboot/$tree"
- cbfstool="elf/cbfstool/$tree/cbfstool"
-
- mecleaner="$PWD/$cbdir/util/me_cleaner/me_cleaner.py"
- kbc1126_ec_dump="$PWD/$cbdir/util/kbc1126/kbc1126_ec_dump"
+ cfgutils
for c in CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN CONFIG_KBC1126_FIRMWARE \
CONFIG_VGA_BIOS_FILE CONFIG_INCLUDE_SMSC_SCH5545_EC_FW; do
@@ -67,7 +63,6 @@ bootstrap()
[ -n "$MRC_refcode_cbtree" ] && \
cbfstoolref="elf/cbfstool/$MRC_refcode_cbtree/cbfstool" && \
x_ ./update trees -b coreboot utils $MRC_refcode_cbtree
- x_ ./update trees -b coreboot utils $tree
}
getfiles()
@@ -297,11 +292,19 @@ readcfg()
build_dependencies_inject()
{
+ cfgutils
+ [ "$nukemode" = "nuke" ] || x_ ./vendor download $board; return 0
+}
+
+cfgutils()
+{
cbdir="src/coreboot/$tree"
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"
x_ ./update trees -b coreboot utils $tree
- [ "$nukemode" = "nuke" ] || x_ ./vendor download $board; return 0
}
patch_release_roms()