vendor.sh: greatly simplified config handling

Signed-off-by: Leah Rowe <leah@libreboot.org>
20240612_branch
Leah Rowe 2024-05-18 19:44:44 +01:00
parent 53b394f583
commit 8418ea9ab2
2 changed files with 2 additions and 5 deletions

View File

@ -122,7 +122,7 @@ EOF
check_defconfig() check_defconfig()
{ {
for x in "${1}"/config/*; do for x in "${1}"/config/*; do
[ -f "${x}" ] && return 1 [ -f "${x}" ] && printf "%s\n" "$x" && return 1
done done
} }

View File

@ -46,10 +46,7 @@ vendor_download()
detect_firmware() detect_firmware()
{ {
[ -d "$boarddir" ] || $err "Target '$board' not defined." [ -d "$boarddir" ] || $err "Target '$board' not defined."
check_defconfig "${boarddir}" && exit 0 . "$(check_defconfig "${boarddir}")" 2>/dev/null || exit 0
set -- "${boarddir}/config/"*
. "${1}" 2>/dev/null
. "${boarddir}/target.cfg" 2>/dev/null . "${boarddir}/target.cfg" 2>/dev/null
[ -z "$tree" ] && $err "detect_firmware $boarddir: tree undefined" [ -z "$tree" ] && $err "detect_firmware $boarddir: tree undefined"