summaryrefslogtreecommitdiff
path: root/script/update
diff options
context:
space:
mode:
Diffstat (limited to 'script/update')
-rwxr-xr-xscript/update/project/trees16
-rwxr-xr-xscript/update/vendor/download8
-rwxr-xr-xscript/update/vendor/inject2
3 files changed, 12 insertions, 14 deletions
diff --git a/script/update/project/trees b/script/update/project/trees
index c8643966..7ba9a38b 100755
--- a/script/update/project/trees
+++ b/script/update/project/trees
@@ -87,7 +87,7 @@ build_targets()
[ $# -gt 0 ] && target1="${1}"
[ "${target1}" = "utils" ] && [ "${project}" = "coreboot" ] && \
shift 1
- targets=$(listitems "${cfgsdir}") || \
+ targets=$(items "${cfgsdir}") || \
err "Cannot get options for ${cfgsdir}"
[ $# -gt 0 ] && targets=$@
@@ -173,15 +173,14 @@ handle_src_tree()
fi
[ "${target1}" = "utils" ] && [ "${project}" = "coreboot" ] && return 0
+ [ "$project" != "coreboot" ] && [ "$project" != "u-boot" ] && return 0
# u-boot and coreboot are both compiled with coreboot's crossgcc
- if [ "${project}" = "coreboot" ] || [ "${project}" = "u-boot" ]; then
- [ ! -z ${mode} ] || check_cross_compiler || \
- err "handle_src_tree ${project}/${target}: crossgcc"
- cbfstool="cbutils/${tree}/cbfstool"
- [ -f "${cbfstool}" ] || \
- x_ ./update project trees -b coreboot utils "${tree}"
- fi
+ [ ! -z ${mode} ] || check_cross_compiler || \
+ err "handle_src_tree ${project}/${target}: crossgcc"
+ cbfstool="cbutils/${tree}/cbfstool"
+ [ -f "${cbfstool}" ] && return 0
+ x_ ./update project trees -b coreboot utils "${tree}"
}
# set up cross-compiler (coreboot crossgcc) for u-boot and coreboot
@@ -279,6 +278,7 @@ run_make_command()
x_ printf "%s\n" "${version%%-*}" >"${codedir}/.coreboot-version"
x_ make ${mode} -j$(nproc) -C "${codedir}"
+
[ "${mode}" != "clean" ] && return 0
make -C "${codedir}" distclean 2>/dev/null || :
}
diff --git a/script/update/vendor/download b/script/update/vendor/download
index 87e9d3a5..b5618c3b 100755
--- a/script/update/vendor/download
+++ b/script/update/vendor/download
@@ -63,9 +63,8 @@ build_dependencies()
x_ ./update project trees -b uefitool
[ -f "${kbc1126_ec_dump}" ] || \
x_ make -C "${cbdir}/util/kbc1126"
- if [ ! -f "${cbfstool}" ] || [ ! -f "${ifdtool}" ]; then
- x_ ./update project trees -b coreboot utils default
- fi
+ [ -f "${cbfstool}" ] && [ -f "${ifdtool}" ] && return 0
+ x_ ./update project trees -b coreboot utils default
}
download_vendorfiles()
@@ -85,8 +84,7 @@ download_vendorfiles()
"${E6400_VGA_DL_url_bkup}" "${E6400_VGA_DL_hash}" \
"${CONFIG_VGA_BIOS_FILE}"
[ -z "${CONFIG_HAVE_MRC}" ] && return 0
- fetch "mrc" "${MRC_url}" "${MRC_url_bkup}" "${MRC_hash}" \
- "${CONFIG_MRC_FILE}"
+ fetch "mrc" "$MRC_url" "$MRC_url_bkup" "$MRC_hash" "$CONFIG_MRC_FILE"
}
fetch()
diff --git a/script/update/vendor/inject b/script/update/vendor/inject
index c4a7f702..d156be25 100755
--- a/script/update/vendor/inject
+++ b/script/update/vendor/inject
@@ -15,7 +15,7 @@ main()
{
[ $# -lt 1 ] && err "No options specified."
[ "${1}" = "listboards" ] && \
- listitems config/coreboot && exit 0
+ items config/coreboot && exit 0
archive="${1}"