delete include/vendor.sh and merge elsewhere

move it all to other files where items are used, and not
used anywhere else. this reduces the size of vendor.sh.

also remove a few redundant variables, or variables that
are not meaningfully used.

a few items have been moved to include/option.sh

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

3 files changed, 24 insertions, 42 deletions

diff --git a/include/mrc.sh b/include/mrc.sh
index 43a59d82..4ff067a9 100755
--- a/include/mrc.sh
+++ b/include/mrc.sh
@@ -4,6 +4,8 @@
 # Modifications in this version are Copyright 2021 and 2023 Leah Rowe.
 # Original copyright detailed in repo: https://review.coreboot.org/coreboot/
 
+eval "$(setvars "" MRC_url MRC_url_bkup MRC_hash MRC_board)"
+
 extract_mrc()
 {
 	[ -z "${MRC_board}" ] && err "extract_mrc $MRC_hash: MRC_board not set"
diff --git a/include/option.sh b/include/option.sh
index 262107fd..991ec0dc 100755
--- a/include/option.sh
+++ b/include/option.sh
@@ -3,6 +3,20 @@
 # SPDX-FileCopyrightText: 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
 # SPDX-FileCopyrightText: 2023 Leah Rowe <leah@libreboot.org>
 
+vendir="vendor"
+appdir="${vendir}/app"
+cbdir="src/coreboot/default"
+cbcfgsdir="config/coreboot"
+ifdtool="cbutils/default/ifdtool"
+cbfstool="cbutils/default/cbfstool"
+
+eval "$(setvars "" CONFIG_BOARD_DELL_E6400 CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \
+    CONFIG_ME_BIN_PATH CONFIG_KBC1126_FIRMWARE CONFIG_KBC1126_FW1 \
+    CONFIG_KBC1126_FW1_OFFSET CONFIG_KBC1126_FW2 CONFIG_KBC1126_FW2_OFFSET \
+    CONFIG_VGA_BIOS_FILE CONFIG_VGA_BIOS_ID CONFIG_GBE_BIN_PATH \
+    CONFIG_INCLUDE_SMSC_SCH5545_EC_FW CONFIG_SMSC_SCH5545_EC_FW_FILE \
+    CONFIG_IFD_BIN_PATH CONFIG_MRC_FILE _dest board boarddir)"
+
 listitems()
 {
 	rval=1
@@ -37,6 +51,14 @@ EOF
 	rm -f "${revfile}" || "${_fail}" "scan_config: Cannot remove tmpfile"
 }
 
+check_defconfig()
+{
+	for x in "${1}"/config/*; do
+		[ -f "${x}" ] && return 0
+	done
+	return 1
+}
+
 handle_coreboot_utils()
 {
 	for util in cbfstool ifdtool; do
diff --git a/include/vendor.sh b/include/vendor.sh
deleted file mode 100755
index d9854d0f..00000000
--- a/include/vendor.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-only
-# SPDX-FileCopyrightText: 2023 Leah Rowe <leah@libreboot.org>
-
-_ua="Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0"
-
-_7ztest="a"
-vendir="vendor"
-appdir="${vendir}/app"
-cbdir="src/coreboot/default"
-cbcfgsdir="config/coreboot"
-ifdtool="cbutils/default/ifdtool"
-cbfstool="cbutils/default/cbfstool"
-nvmutil="util/nvmutil/nvm"
-pciromsdir="pciroms"
-
-mecleaner="${PWD}/src/coreboot/default/util/me_cleaner/me_cleaner.py"
-me7updateparser="${PWD}/util/me7_update_parser/me7_update_parser.py"
-e6400_unpack="${PWD}/src/bios_extract/dell_inspiron_1100_unpacker.py"
-kbc1126_ec_dump="${PWD}/${cbdir}/util/kbc1126/kbc1126_ec_dump"
-pfs_extract="${PWD}/src/biosutilities/Dell_PFS_Extract.py"
-uefiextract="${PWD}/src/uefitool/uefiextract"
-
-eval "$(setvars "" EC_url EC_url_bkup EC_hash DL_hash DL_url DL_url_bkup _dest \
-    E6400_VGA_DL_hash E6400_VGA_DL_url E6400_VGA_DL_url_bkup E6400_VGA_offset \
-    E6400_VGA_romname SCH5545EC_DL_url SCH5545EC_DL_url_bkup SCH5545EC_DL_hash \
-    MRC_url MRC_url_bkup MRC_hash MRC_board archive rom board modifygbe _dl \
-    new_mac release releasearchive _b boarddir nukemode rom)"
-
-eval "$(setvars "" CONFIG_BOARD_DELL_E6400 CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \
-    CONFIG_ME_BIN_PATH CONFIG_KBC1126_FIRMWARE CONFIG_KBC1126_FW1 \
-    CONFIG_KBC1126_FW1_OFFSET CONFIG_KBC1126_FW2 CONFIG_KBC1126_FW2_OFFSET \
-    CONFIG_VGA_BIOS_FILE CONFIG_VGA_BIOS_ID CONFIG_GBE_BIN_PATH \
-    CONFIG_INCLUDE_SMSC_SCH5545_EC_FW CONFIG_SMSC_SCH5545_EC_FW_FILE \
-    CONFIG_IFD_BIN_PATH CONFIG_MRC_FILE)"
-
-check_defconfig()
-{
-	for x in "${1}"/config/*; do
-		[ -f "${x}" ] && return 0
-	done
-	return 1
-}