summaryrefslogtreecommitdiff
path: root/resources/scripts/update
diff options
context:
space:
mode:
Diffstat (limited to 'resources/scripts/update')
-rwxr-xr-xresources/scripts/update/blobs/inject16
-rwxr-xr-xresources/scripts/update/module/mrc6
2 files changed, 5 insertions, 17 deletions
diff --git a/resources/scripts/update/blobs/inject b/resources/scripts/update/blobs/inject
index ca8aae4c..891cb198 100755
--- a/resources/scripts/update/blobs/inject
+++ b/resources/scripts/update/blobs/inject
@@ -17,8 +17,8 @@ releasearchive=""
cbdir="coreboot/default"
cbcfgsdir="resources/coreboot"
-ifdtool="${cbdir}/util/ifdtool/ifdtool"
-cbfstool="${cbdir}/util/cbfstool/cbfstool"
+ifdtool="cbutils/default/ifdtool"
+cbfstool="cbutils/default/cbfstool"
nvmutil="util/nvmutil/nvm"
boarddir=""
pciromsdir="pciroms"
@@ -140,17 +140,7 @@ build_dependencies()
./download coreboot default
fi
- if [ ! -f "${ifdtool}" ]; then
- printf "building ifdtool from coreboot\n"
- ./build module cbutils default \
- || fail 'could not build ifdtool'
- fi
-
- if [ ! -f "${cbfstool}" ]; then
- printf "building cbfstool from coreboot\n"
- ./build module cbutils default \
- || fail 'could not build cbfstool'
- fi
+ ./build module cbutils default || fail "could not build cbutils"
./blobutil download ${board} || \
fail "Could not download blobs for ${board}"
diff --git a/resources/scripts/update/module/mrc b/resources/scripts/update/module/mrc
index ed0b38f3..d6a1c3a6 100755
--- a/resources/scripts/update/module/mrc
+++ b/resources/scripts/update/module/mrc
@@ -41,7 +41,7 @@ _mrc_complete_hash="d18de1e3d52c0815b82ea406ca07897c56c65696"
_mrc_complete="mrc/haswell/mrc.bin"
cbdir="coreboot/default"
-cbfstool="${cbdir}/util/cbfstool/cbfstool"
+cbfstool="cbutils/default/cbfstool"
sname=""
@@ -76,9 +76,7 @@ build_dependencies()
if [ ! -d "${cbdir}/" ]; then
./download coreboot default || return 1
fi
- if [ ! -f "${cbfstool}" ]; then
- ./build module cbutils default || return 1
- fi
+ ./build module cbutils default || return 1
return 0
}