libreboot
/
lbmk
1
0
Fork 0
Code Packages Projects Releases Activity

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>
20240612_branch
Leah Rowe 2024-05-18 19:28:15 +01:00
parent bb7255c34b
commit 53b394f583
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/vendor.sh
View File

@ -36,9 +36,6 @@ vendor_download()
boarddir="${cbcfgsdir}/${board}" boarddir="${cbcfgsdir}/${board}"
_b="${board%%_*mb}" # shorthand (no duplication per rom size) _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 detect_firmware && exit 0
scan_config "${_b}" "config/vendor" scan_config "${_b}" "config/vendor"
@ -48,6 +45,9 @@ vendor_download()
detect_firmware() detect_firmware()
{ {
[ -d "$boarddir" ] || $err "Target '$board' not defined."
check_defconfig "${boarddir}" && exit 0
set -- "${boarddir}/config/"* set -- "${boarddir}/config/"*
. "${1}" 2>/dev/null . "${1}" 2>/dev/null
. "${boarddir}/target.cfg" 2>/dev/null . "${boarddir}/target.cfg" 2>/dev/null