summaryrefslogtreecommitdiff
path: root/script/update/vendor
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2023-10-15 11:22:43 +0100
committerLeah Rowe <leah@libreboot.org>2023-10-15 13:00:14 +0100
commitc14461a56b5203893466eaede7747047668693d8 (patch)
treec20d9fa1cebc3dfb220fb7540413d8132356ae7e /script/update/vendor
parentd8c2c24507c0999240c74c4b85e33e1646d84e7f (diff)
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>
Diffstat (limited to 'script/update/vendor')
-rwxr-xr-xscript/update/vendor/download17
-rwxr-xr-xscript/update/vendor/inject20
2 files changed, 24 insertions, 13 deletions
diff --git a/script/update/vendor/download b/script/update/vendor/download
index a32be3ba..87e9d3a5 100755
--- a/script/update/vendor/download
+++ b/script/update/vendor/download
@@ -5,12 +5,25 @@
# SPDX-FileCopyrightText: 2023 Leah Rowe <leah@libreboot.org>
. "include/err.sh"
-. "include/vendor.sh"
-. "include/mrc.sh"
. "include/option.sh"
+. "include/mrc.sh"
export PATH="${PATH}:/sbin"
+_ua="Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0"
+_7ztest="a"
+
+e6400_unpack="${PWD}/src/bios_extract/dell_inspiron_1100_unpacker.py"
+kbc1126_ec_dump="${PWD}/${cbdir}/util/kbc1126/kbc1126_ec_dump"
+me7updateparser="${PWD}/util/me7_update_parser/me7_update_parser.py"
+mecleaner="${PWD}/${cbdir}/util/me_cleaner/me_cleaner.py"
+pfs_extract="${PWD}/src/biosutilities/Dell_PFS_Extract.py"
+uefiextract="${PWD}/src/uefitool/uefiextract"
+
+eval "$(setvars "" _b _dl EC_url EC_url_bkup EC_hash DL_hash DL_url DL_url_bkup \
+ 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)"
+
main()
{
[ $# -gt 0 ] || err "No argument given"
diff --git a/script/update/vendor/inject b/script/update/vendor/inject
index 10692196..c4a7f702 100755
--- a/script/update/vendor/inject
+++ b/script/update/vendor/inject
@@ -5,10 +5,11 @@
# SPDX-FileCopyrightText: 2023 Leah Rowe <leah@libreboot.org>
. "include/err.sh"
-. "include/vendor.sh"
. "include/option.sh"
-release_archive="n"
+nvmutil="util/nvmutil/nvm"
+
+eval "$(setvars "" archive rom modifygbe nukemode release new_mac)"
main()
{
@@ -46,8 +47,7 @@ check_board()
[ ! -z ${board+x} ] || \
board=$(detect_board "${rom}")
else
- release=true
- releasearchive="${archive}"
+ release="y"
board=$(detect_board "${archive}")
fi
@@ -98,10 +98,8 @@ build_dependencies()
inject_vendorfiles()
{
- release_archive="n"
- [ "${release}" != "true" ] && x_ patch_rom "${rom}" && return 0
- printf "patching release file\n"
- release_archive="y"
+ [ "${release}" != "y" ] && x_ patch_rom "${rom}" && return 0
+ printf "patching release images\n"
patch_release_roms
}
@@ -110,7 +108,7 @@ patch_release_roms()
_tmpdir="tmp/romdir"
x_ rm -Rf "${_tmpdir}"
x_ mkdir -p "${_tmpdir}"
- x_ tar -xf "${releasearchive}" -C "${_tmpdir}"
+ x_ tar -xf "${archive}" -C "${_tmpdir}"
for x in "${_tmpdir}"/bin/*/*.rom ; do
printf "patching rom: %s\n" "$x"
@@ -162,7 +160,7 @@ patch_rom()
# (unless nomicrocode is the only config provided)
[ "${rom}" != "${rom%_nomicrocode.rom}.rom" ] && \
[ -f "${rom%_nomicrocode.rom}.rom" ] && \
- [ "${release_archive}" = "y" ] && return 0
+ [ "${release}" = "y" ] && return 0
x_ check_defconfig "${boarddir}"
@@ -185,7 +183,7 @@ patch_rom()
[ "${CONFIG_INCLUDE_SMSC_SCH5545_EC_FW}" = "y" ] && \
[ ! -z "${CONFIG_SMSC_SCH5545_EC_FW_FILE}" ] && \
inject "sch5545_ecfw.bin" "$CONFIG_SMSC_SCH5545_EC_FW_FILE" raw
- [ "${modifygbe}" = "true" ] && ! [ "${release}" = "true" ] && \
+ [ "${modifygbe}" = "true" ] && ! [ "${release}" = "y" ] && \
inject "IFD" "${CONFIG_GBE_BIN_PATH}" "GbE"
printf "ROM image successfully patched: %s\n" "${rom}"