vendor.sh: simplify getfiles()

Signed-off-by: Leah Rowe <leah@libreboot.org>

1 files changed, 26 insertions, 31 deletions

diff --git a/include/vendor.sh b/include/vendor.sh
index e92e811a..5e1c77ff 100644
--- a/include/vendor.sh
+++ b/include/vendor.sh
@@ -21,16 +21,15 @@ appdir="$vendir/app"
 vfix="DO_NOT_FLASH_YET._FIRST,_INJECT_FILES_VIA_INSTRUCTIONS_ON_LIBREBOOT.ORG_"
 
 # lbmk-specific extension to the "cv" variable (not suitable for cbmk)
-cvchk="CONFIG_INCLUDE_SMSC_SCH5545_EC_FW CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \
+cvchk="CONFIG_SMSC_SCH5545_EC_FW_FILE CONFIG_MRC_FILE CONFIG_ME_BIN_PATH \
     CONFIG_LENOVO_TBFW_BIN CONFIG_VGA_BIOS_FILE CONFIG_FSP_M_FILE \
     CONFIG_FSP_S_FILE CONFIG_KBC1126_FW1 CONFIG_KBC1126_FW2"
 
 # lbmk-specific extensions to the "cv" variable (not suitable for cbmk)
-cvxbmk="CONFIG_ME_BIN_PATH CONFIG_SMSC_SCH5545_EC_FW_FILE CONFIG_FSP_FULL_FD \
+cvxbmk="CONFIG_FSP_FULL_FD CONFIG_IFD_BIN_PATH CONFIG_FSP_M_CBFS \
     CONFIG_KBC1126_FW1_OFFSET CONFIG_KBC1126_FW2_OFFSET CONFIG_FSP_USE_REPO \
     CONFIG_VGA_BIOS_ID CONFIG_BOARD_DELL_E6400 CONFIG_FSP_S_CBFS \
-    CONFIG_HAVE_REFCODE_BLOB CONFIG_REFCODE_BLOB_FILE CONFIG_FSP_FD_PATH \
-    CONFIG_IFD_BIN_PATH CONFIG_MRC_FILE CONFIG_FSP_M_CBFS"
+    CONFIG_HAVE_REFCODE_BLOB CONFIG_REFCODE_BLOB_FILE CONFIG_FSP_FD_PATH"
 
 # lbmk-specific extensions; mostly used for downloading vendor files
 eval "`setvars "" has_hashes EC_hash DL_hash DL_url_bkup MRC_refcode_gbe vcfg \
@@ -52,32 +51,28 @@ download()
 
 getfiles()
 {
-	[ -z "$CONFIG_HAVE_ME_BIN" ] || fetch intel_me "$DL_url" \
-	    "$DL_url_bkup" "$DL_hash" "$CONFIG_ME_BIN_PATH" curl "$ME_bin_hash"
-	[ -z "$CONFIG_INCLUDE_SMSC_SCH5545_EC_FW" ] || fetch sch5545ec \
-	    "$SCH5545EC_DL_url" "$SCH5545EC_DL_url_bkup" "$SCH5545EC_DL_hash" \
-	    "$CONFIG_SMSC_SCH5545_EC_FW_FILE" "curl" "$SCH5545EC_bin_hash"
-	[ -z "$CONFIG_KBC1126_FW1" ] || fetch kbc1126ec "$EC_url" \
-	    "$EC_url_bkup" "$EC_hash" "$CONFIG_KBC1126_FW1" curl "$EC_FW1_hash"
-	[ -z "$CONFIG_KBC1126_FW2" ] || fetch kbc1126ec "$EC_url" \
-	    "$EC_url_bkup" "$EC_hash" "$CONFIG_KBC1126_FW2" curl "$EC_FW2_hash"
-	[ -z "$CONFIG_VGA_BIOS_FILE" ] || fetch e6400vga "$E6400_VGA_DL_url" \
-	    "$E6400_VGA_DL_url_bkup" "$E6400_VGA_DL_hash" \
-	    "$CONFIG_VGA_BIOS_FILE" "curl" "$E6400_VGA_bin_hash"
-	[ -z "$CONFIG_HAVE_MRC" ] || fetch "mrc" "$MRC_url" "$MRC_url_bkup" \
-	    "$MRC_hash" "$CONFIG_MRC_FILE" "curl" "$MRC_bin_hash"
-	[ -z "$CONFIG_REFCODE_BLOB_FILE" ] || fetch "refcode" "$MRC_url" \
-	    "$MRC_url_bkup" "$MRC_hash" "$CONFIG_REFCODE_BLOB_FILE" "curl" \
-	    "$REF_bin_hash"
-	[ -z "$CONFIG_LENOVO_TBFW_BIN" ] || fetch "tbfw" "$TBFW_url" \
-	    "$TBFW_url_bkup" "$TBFW_hash" "$CONFIG_LENOVO_TBFW_BIN" "curl" \
-	    "$TBFW_bin_hash"
-	[ -z "$CONFIG_FSP_M_FILE" ] || fetch "fsp" "$CONFIG_FSP_FD_PATH" \
-	    "$CONFIG_FSP_FD_PATH" "$FSPFD_hash" "$CONFIG_FSP_M_FILE" "copy" \
-	    "$FSPM_bin_hash"
-	[ -z "$CONFIG_FSP_S_FILE" ] || fetch "fsp" "$CONFIG_FSP_FD_PATH" \
-	    "$CONFIG_FSP_FD_PATH" "$FSPFD_hash" "$CONFIG_FSP_S_FILE" "copy" \
-	    "$FSPS_bin_hash"; :
+	fetch intel_me "$DL_url" "$DL_url_bkup" "$DL_hash" \
+	    "$CONFIG_ME_BIN_PATH" curl "$ME_bin_hash"
+	fetch sch5545ec "$SCH5545EC_DL_url" "$SCH5545EC_DL_url_bkup" \
+	    "$SCH5545EC_DL_hash" "$CONFIG_SMSC_SCH5545_EC_FW_FILE" curl \
+	    "$SCH5545EC_bin_hash"
+	fetch kbc1126ec "$EC_url" "$EC_url_bkup" "$EC_hash" \
+	    "$CONFIG_KBC1126_FW1" curl "$EC_FW1_hash"
+	fetch kbc1126ec "$EC_url" "$EC_url_bkup" "$EC_hash" \
+	    "$CONFIG_KBC1126_FW2" curl "$EC_FW2_hash"
+	fetch e6400vga "$E6400_VGA_DL_url" "$E6400_VGA_DL_url_bkup" \
+	    "$E6400_VGA_DL_hash" "$CONFIG_VGA_BIOS_FILE" curl \
+	    "$E6400_VGA_bin_hash"
+	fetch mrc "$MRC_url" "$MRC_url_bkup" "$MRC_hash" "$CONFIG_MRC_FILE" \
+	    curl "$MRC_bin_hash"
+	fetch refcode "$MRC_url" "$MRC_url_bkup" "$MRC_hash" \
+	    "$CONFIG_REFCODE_BLOB_FILE" curl "$REF_bin_hash"
+	fetch tbfw "$TBFW_url" "$TBFW_url_bkup" "$TBFW_hash" \
+	    "$CONFIG_LENOVO_TBFW_BIN" curl "$TBFW_bin_hash"
+	fetch fsp "$CONFIG_FSP_FD_PATH" "$CONFIG_FSP_FD_PATH" "$FSPFD_hash" \
+	    "$CONFIG_FSP_M_FILE" copy "$FSPM_bin_hash"
+	fetch fsp "$CONFIG_FSP_FD_PATH" "$CONFIG_FSP_FD_PATH" "$FSPFD_hash" \
+	    "$CONFIG_FSP_S_FILE" copy "$FSPS_bin_hash"; :
 }
 
 fetch()
@@ -86,7 +81,7 @@ fetch()
 	dl="$2"
 	dl_bkup="$3"
 	dlsum="$4"
-	_dest="${5##*../}"
+	_dest="${5##*../}" && [ -z "$_dest" ] && return 0
 	_pre_dest="$XBMK_CACHE/tmpdl/check" || err "!fetch, mktemp, $*"
 	dlop="$6"
 	binsum="$7"