summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2024-05-18 19:28:15 +0100
committerLeah Rowe <leah@libreboot.org>2024-05-18 19:28:15 +0100
commit53b394f583cb0e2afce22cd759d4100a9a8a588f (patch)
tree6511ca01269e8a8f056988a66a78cc6ecacdf596 /include
parentbb7255c34ba807955b6f64cacb1e1dced4bea4bd (diff)
vendor.sh: move config checks to detect_firmware
they will later be removed, as part of unification against other files that perform the same tasks Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include')
-rwxr-xr-xinclude/vendor.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/vendor.sh b/include/vendor.sh
index 8992995f..eb250a6f 100755
--- a/include/vendor.sh
+++ b/include/vendor.sh
@@ -36,9 +36,6 @@ vendor_download()
boarddir="${cbcfgsdir}/${board}"
_b="${board%%_*mb}" # shorthand (no duplication per rom size)
- [ -d "$boarddir" ] || $err "Target '$board' not defined."
-
- check_defconfig "${boarddir}" && exit 0
detect_firmware && exit 0
scan_config "${_b}" "config/vendor"
@@ -48,6 +45,9 @@ vendor_download()
detect_firmware()
{
+ [ -d "$boarddir" ] || $err "Target '$board' not defined."
+ check_defconfig "${boarddir}" && exit 0
+
set -- "${boarddir}/config/"*
. "${1}" 2>/dev/null
. "${boarddir}/target.cfg" 2>/dev/null