summaryrefslogtreecommitdiff
path: root/script/update/blobs/extract
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2023-09-04 17:47:13 +0100
committerLeah Rowe <leah@libreboot.org>2023-09-04 18:12:49 +0100
commita56cad71c08ab87195823ba44fd2167aeab0802c (patch)
tree7a91e1f8040aeae38ba194d0389f55123d4fdfeb /script/update/blobs/extract
parent2cbc7eea9533c6da7a4b1cbc3408066aaef85f5a (diff)
update/blobs: unify global variables
they all more or less use the same variables, so put them all under include/blobutil.sh Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'script/update/blobs/extract')
-rwxr-xr-xscript/update/blobs/extract24
1 files changed, 2 insertions, 22 deletions
diff --git a/script/update/blobs/extract b/script/update/blobs/extract
index 1ea7070b..4404f9e2 100755
--- a/script/update/blobs/extract
+++ b/script/update/blobs/extract
@@ -7,27 +7,7 @@
. "include/err.sh"
. "include/defconfig.sh"
-
-sname=""
-board=""
-vendor_rom=""
-
-cbdir="coreboot/default"
-cbcfgsdir="config/coreboot"
-ifdtool="${cbdir}/util/ifdtool/ifdtool"
-mecleaner="me_cleaner/me_cleaner.py"
-me7updateparser="util/me7_update_parser/me7_update_parser.py"
-
-boarddir=""
-
-CONFIG_HAVE_MRC=""
-CONFIG_ME_BIN_PATH=""
-CONFIG_GBE_BIN_PATH=""
-CONFIG_IFD_BIN_PATH=""
-
-_me_destination=""
-_gbe_destination=""
-_ifd_destination=""
+. "include/blobutil.sh"
main()
{
@@ -53,7 +33,7 @@ build_dependencies()
./update project trees coreboot default || \
err "build_dependencies: can't fetch coreboot"
elif [ ! -f "${ifdtool}" ]; then
- make -C "${ifdtool%/ifdtool}" || \
+ ./build coreboot utils || \
err "build_dependencies: can't build ifdtool"
fi
}