From a56cad71c08ab87195823ba44fd2167aeab0802c Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 4 Sep 2023 17:47:13 +0100 Subject: 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 --- script/update/blobs/extract | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'script/update/blobs/extract') 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 } -- cgit v1.2.1