1 files changed, 89 insertions, 151 deletions

diff --git a/include/vendor.sh b/include/vendor.sh
index 949ffc48..26ea466e 100755
--- a/include/vendor.sh
+++ b/include/vendor.sh
@@ -3,13 +3,10 @@
 # Copyright (c) 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
 # Copyright (c) 2023-2024 Leah Rowe <leah@libreboot.org>
 
-_7ztest="a"
-
 e6400_unpack="$PWD/src/bios_extract/dell_inspiron_1100_unpacker.py"
 me7updateparser="$PWD/util/me7_update_parser/me7_update_parser.py"
 pfs_extract="$PWD/src/biosutilities/Dell_PFS_Extract.py"
 uefiextract="$PWD/elf/uefitool/uefiextract"
-nvmutil="util/nvmutil/nvm"
 vendir="vendorfiles"
 appdir="$vendir/app"
 cbcfgsdir="config/coreboot"
@@ -18,40 +15,28 @@ eval `setvars "" EC_url_bkup EC_hash DL_hash DL_url_bkup MRC_refcode_gbe vcfg \
     E6400_VGA_DL_hash E6400_VGA_DL_url E6400_VGA_DL_url_bkup E6400_VGA_offset \
     E6400_VGA_romname CONFIG_HAVE_MRC SCH5545EC_DL_url_bkup SCH5545EC_DL_hash \
     mecleaner kbc1126_ec_dump MRC_refcode_cbtree new_mac _dl SCH5545EC_DL_url \
-    CONFIG_BOARD_DELL_E6400 CONFIG_HAVE_ME_BIN archive EC_url modifygbe rom \
+    CONFIG_BOARD_DELL_E6400 CONFIG_HAVE_ME_BIN archive EC_url boarddir rom \
     CONFIG_ME_BIN_PATH CONFIG_KBC1126_FIRMWARE _dest tree CONFIG_GBE_BIN_PATH \
     CONFIG_KBC1126_FW1_OFFSET CONFIG_KBC1126_FW2 CONFIG_KBC1126_FW2_OFFSET \
-    CONFIG_VGA_BIOS_FILE CONFIG_VGA_BIOS_ID CONFIG_KBC1126_FW1 release DL_url \
+    CONFIG_VGA_BIOS_FILE CONFIG_VGA_BIOS_ID CONFIG_KBC1126_FW1 cbdir DL_url \
     CONFIG_INCLUDE_SMSC_SCH5545_EC_FW CONFIG_SMSC_SCH5545_EC_FW_FILE nukemode \
     CONFIG_IFD_BIN_PATH CONFIG_MRC_FILE CONFIG_HAVE_REFCODE_BLOB cbfstoolref \
-    CONFIG_REFCODE_BLOB_FILE`
+    CONFIG_REFCODE_BLOB_FILE vrelease verify _7ztest`
 
 vendor_download()
 {
 	export PATH="$PATH:/sbin"
 
 	[ $# -gt 0 ] || $err "No argument given"
-	board="$1"; boarddir="$cbcfgsdir/$board"
-	getcfg && bootstrap && getfiles; return 0
+	board="$1" && readcfg && readkconfig && bootstrap && getfiles; return 0
 }
 
-getcfg()
+readkconfig()
 {
-	eval `setcfg "$boarddir/target.cfg"`
-
-	[ -z "$vcfg" ] && printf "%s: vcfg unset\n" "$board" 1>&2 && return 1
-
-	check_defconfig "$boarddir" 1>"$tmpdir/vendorcfg.list" && return 1
+	check_defconfig "$boarddir" 1>"$TMPDIR/vendorcfg.list" && return 1
 	while read -r cbcfgfile; do
 		set +u +e; . "$cbcfgfile" 2>/dev/null; set -u -e
-	done < "$tmpdir/vendorcfg.list"
-
-	[ -z "$tree" ] && $err "getcfg $boarddir: tree undefined"
-	cbdir="src/coreboot/$tree"
-	cbfstool="elf/cbfstool/$tree/cbfstool"
-
-	mecleaner="$PWD/$cbdir/util/me_cleaner/me_cleaner.py"
-	kbc1126_ec_dump="$PWD/$cbdir/util/kbc1126/kbc1126_ec_dump"
+	done < "$TMPDIR/vendorcfg.list"
 
 	for c in CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN CONFIG_KBC1126_FIRMWARE \
 	    CONFIG_VGA_BIOS_FILE CONFIG_INCLUDE_SMSC_SCH5545_EC_FW; do
@@ -64,20 +49,14 @@ getcfg()
 
 bootstrap()
 {
-	[ -d "$cbdir" ] || x_ ./update trees -f coreboot ${cbdir##*/}
+	x_ ./update trees -f coreboot ${cbdir##*/}
 	for d in uefitool biosutilities bios_extract; do
-		[ -d "src/$d" ] && continue
-		x_ ./update trees -f "$d"
+		x_ ./update trees -b "$d"
 	done
-	[ -f "$uefiextract" ] || x_ ./update trees -b uefitool
-	[ ! -d "${kbc1126_ec_dump%/*}" ] || [ -f "$kbc1126_ec_dump" ] || x_ \
-	    make -C "$cbdir/util/kbc1126"
+	[ -d "${kbc1126_ec_dump%/*}" ] && x_ make -C "$cbdir/util/kbc1126"
 	[ -n "$MRC_refcode_cbtree" ] && \
-		cbfstoolref="elf/cbfstool/$MRC_refcode_cbtree/cbfstool"
-	[ -z "$cbfstoolref" ] || [ -f "$cbfstoolref" ] || \
-	    x_ ./update trees -b coreboot utils $MRC_refcode_cbtree
-	[ -f "$cbfstool" ] && [ -f "$ifdtool" ] && return 0
-	x_ ./update trees -b coreboot utils $tree
+	    cbfstoolref="elf/cbfstool/$MRC_refcode_cbtree/cbfstool" && \
+	    x_ ./update trees -b coreboot utils $MRC_refcode_cbtree; return 0
 }
 
 getfiles()
@@ -98,15 +77,8 @@ getfiles()
 
 fetch()
 {
-	dl_type="$1"
-	dl="$2"
-	dl_bkup="$3"
-	dlsum="$4"
-	[ "$5" = "/dev/null" ] && return 0
-	[ "${5# }" = "$5" ] || $err "fetch: space not allowed in _dest: '$5'"
-	[ "${5#/}" = "$5" ] || $err "fetch: absolute path not allowed: '$5'"
-	_dest="${5##*../}"
-	_dl="$vendir/cache/$dlsum"
+	dl_type="$1"; dl="$2"; dl_bkup="$3"; dlsum="$4"; _dest="${5##*../}"
+	[ "$5" = "/dev/null" ] && return 0; _dl="$vendir/cache/$dlsum"
 
 	download "$dl" "$dl_bkup" "$_dl" "$dlsum"
 
@@ -115,8 +87,7 @@ fetch()
 	eval "extract_$dl_type"
 	set -u -e
 
-	[ -f "$_dest" ] && return 0
-	$err "extract_$dl_type (fetch): missing file: '$_dest'"
+	e "$_dest" f missing && $err "!extract_$dl_type"; return 0
 }
 
 mkdirs()
@@ -179,12 +150,11 @@ extract_archive()
 
 extract_kbc1126ec()
 {
-	[ ! -f "$kbc1126_ec_dump" ] && \
-		$err "extract_kbc1126ec $cbdir: kbc1126_ec_dump missing"
+	e "$kbc1126_ec_dump" f missing && $err "$cbdir: kbc1126 util missing"
 	(
 	x_ cd "$appdir/"
 	mv Rompaq/68*.BIN ec.bin || :
-	if [ ! -f ec.bin ]; then
+	if [ ! -f "ec.bin" ]; then
 		unar -D ROM.CAB Rom.bin || unar -D Rom.CAB Rom.bin || \
 		    unar -D 68*.CAB Rom.bin || $err "can't extract Rom.bin"
 		x_ mv Rom.bin ec.bin
@@ -202,16 +172,12 @@ extract_kbc1126ec()
 extract_e6400vga()
 {
 	set +u +e
-	for v in E6400_VGA_offset E6400_VGA_romname; do
-		eval "[ -z \"\$$v\" ] && $err \"e6400vga: $v undefined\""
-	done
+	chkvars E6400_VGA_offset E6400_VGA_romname
 	tail -c +$E6400_VGA_offset "$_dl" | gunzip > "$appdir/bios.bin" || :
 	(
 	x_ cd "$appdir"
 	[ -f "bios.bin" ] || $err "extract_e6400vga: can't extract bios.bin"
 	"$e6400_unpack" bios.bin || printf "TODO: fix dell extract util\n"
-	[ -f "$E6400_VGA_romname" ] || \
-		$err "extract_e6400vga: can't extract vga rom from bios.bin"
 	) || $err "can't extract e6400 vga rom"
 	cp "$appdir/$E6400_VGA_romname" "$_dest" || \
 	    $err "extract_e6400vga $board: can't copy vga rom to $_dest"
@@ -244,37 +210,32 @@ vendor_inject()
 		n) nukemode="$OPTARG" ;;
 		r) rom="$OPTARG" ;;
 		b) board="$OPTARG" ;;
-		m) modifygbe="true"
-		   new_mac="$OPTARG" ;;
+		m) new_mac="$OPTARG"; chkvars new_mac ;;
 		*) : ;;
 		esac
 	done
 
-	check_board
-	build_dependencies_inject
-	inject_vendorfiles
+	check_board || return 0
+	[ "$nukemode" = "nuke" ] || x_ ./vendor download $board
+	[ "$vrelease" != "y" ] && patch_rom "$rom"
+	[ "$vrelease" = "y" ] && patch_release_roms
+
 	[ "$nukemode" = "nuke" ] && return 0
 	printf "Friendly reminder (this is *not* an error message):\n"
-	printf "Please ensure that the files were inserted correctly. ALSO:\n"
-	printf "%s\n" "$kbnotice"
+	printf "Make sure the files were inserted. ALSO:\n%s\n" "$kbnotice"
 }
 
 check_board()
 {
-	failcheck="n"
-	check_release "$archive" || failcheck="y"
+	failcheck="y" && check_release "$archive" && failcheck="n"
 	if [ "$failcheck" = "y" ]; then
 		[ -f "$rom" ] || $err "check_board \"$rom\": invalid path"
 		[ -z "${rom+x}" ] && $err "check_board: no rom specified"
 		[ -n "${board+x}" ] || board="$(detect_board "$rom")"
 	else
-		release="y"
-		board="$(detect_board "$archive")"
+		vrelease="y"; board="$(detect_board "$archive")"
 	fi
-
-	boarddir="$cbcfgsdir/$board"
-	eval `setcfg "$boarddir/target.cfg"`
-	[ -z "$tree" ] && $err "check_board $board: tree undefined"; return 0
+	readcfg || return 1; return 0
 }
 
 check_release()
@@ -291,71 +252,62 @@ detect_board()
 	path="$1"
 	filename="$(basename "$path")"
 	case "$filename" in
-	grub_*)
-		board="$(echo "$filename" | cut -d '_' -f2-3)" ;;
+	grub_*) board="$(echo "$filename" | cut -d '_' -f2-3)" ;;
 	seabios_withgrub_*)
 		board="$(echo "$filename" | cut -d '_' -f3-4)" ;;
 	*.tar.xz)
 		_stripped_prefix="${filename#*_}"
 		board="${_stripped_prefix%.tar.xz}" ;;
-	*)
-		$err "detect_board $filename: could not detect board type"
-	esac
-	printf "%s\n" "$board"
+	*) $err "detect_board $filename: could not detect board type"
+	esac; printf "%s\n" "$board"
 }
 
-build_dependencies_inject()
+readcfg()
 {
+	if [ "$board" = "serprog_rp2040" ] || \
+	    [ "$board" = "serprog_stm32" ]; then
+		return 1
+	fi
+	boarddir="$cbcfgsdir/$board"
+	eval `setcfg "$boarddir/target.cfg"`
+	chkvars vcfg tree
+
 	cbdir="src/coreboot/$tree"
 	cbfstool="elf/cbfstool/$tree/cbfstool"
+	mecleaner="$PWD/$cbdir/util/me_cleaner/me_cleaner.py"
+	kbc1126_ec_dump="$PWD/$cbdir/util/kbc1126/kbc1126_ec_dump"
+	cbfstool="elf/cbfstool/$tree/cbfstool"
 	ifdtool="elf/ifdtool/$tree/ifdtool"
-	[ -d "$cbdir" ] || x_ ./update trees -f coreboot $tree
-	if [ ! -f "$cbfstool" ] || [ ! -f "$ifdtool" ]; then
-		x_ ./update trees -b coreboot utils $tree
-	fi
-	[ -z "$new_mac" ] || [ -f "$nvmutil" ] || x_ make -C util/nvmutil
-	[ "$nukemode" = "nuke" ] || x_ ./vendor download $board; return 0
-}
-
-inject_vendorfiles()
-{
-	[ "$release" != "y" ] && eval "patch_rom \"$rom\"; return 0"
-	patch_release_roms
+	x_ ./update trees -b coreboot utils $tree
 }
 
 patch_release_roms()
 {
-	_tmpdir="tmp/romdir"
-	remkdir "$_tmpdir"
-	tar -xf "$archive" -C "$_tmpdir" || \
-	    $err "patch_release_roms: !tar -xf \"$archive\" -C \"$_tmpdir\""
+	remkdir "tmp/romdir"
+	tar -xf "$archive" -C "tmp/romdir" || \
+	    $err "patch_release_roms: !tar -xf \"$archive\" -C \"tmp/romdir\""
 
-	for x in "$_tmpdir"/bin/*/*.rom ; do
-		printf "patching rom: %s\n" "$x"
+	for x in "tmp/romdir/bin/"*/*.rom ; do
 		patch_rom "$x"
 	done
 
 	(
-	cd "$_tmpdir/bin/"* || \
-	    $err "patch_release_roms: !cd $_tmpdir/bin/*"
+	cd "tmp/romdir/bin/"* || $err "patch roms: !cd tmp/romdir/bin/*"
 
 	# NOTE: For compatibility with older rom releases, defer to sha1
-	[ "$nukemode" = "nuke" ] || sha512sum --status -c vendorhashes || \
+	[ "$verify" != "y" ] || [ "$nukemode" = "nuke" ] || \
+	    sha512sum --status -c vendorhashes || \
 	    sha1sum --status -c vendorhashes || sha512sum --status -c \
 	    blobhashes || sha1sum --status -c blobhashes || \
 	    $err "patch_release_roms: ROMs did not match expected hashes"
 	) || $err "can't verify vendor hashes"
 
-	[ "$modifygbe" = "true" ] && \
-		for x in "$_tmpdir"/bin/*/*.rom ; do
-			modify_gbe "$x"
-		done
-
-	[ -d "bin/release" ] || x_ mkdir -p bin/release
-	x_ mv "$_tmpdir"/bin/* bin/release/
-	x_ rm -Rf "$_tmpdir"
+	[ -n "$new_mac" ] && for x in "tmp/romdir/bin/"*/*.rom ; do
+		[ -f "$x" ] && modify_gbe "$x"
+	done
 
-	printf "Success! Your ROMs are in bin/release\n"
+	x_ mkdir -p bin/release
+	mv tmp/romdir/bin/* bin/release/ || $err "$board: !mv release roms"
 }
 
 patch_rom()
@@ -368,20 +320,17 @@ patch_rom()
 	    "mrc" "0xfffa0000"
 	[ -n "$CONFIG_HAVE_REFCODE_BLOB" ] && inject "fallback/refcode" \
 	    "$CONFIG_REFCODE_BLOB_FILE" "stage"
-	[ "$CONFIG_HAVE_ME_BIN" = "y" ] && inject "IFD" "$CONFIG_ME_BIN_PATH" \
-	    "me"
-	[ "$CONFIG_KBC1126_FIRMWARE" = "y" ] && inject "ecfw1.bin" \
-	    "$CONFIG_KBC1126_FW1" "raw" "$CONFIG_KBC1126_FW1_OFFSET" && \
-		inject "ecfw2.bin" "$CONFIG_KBC1126_FW2" "raw" \
-		    "$CONFIG_KBC1126_FW2_OFFSET"
+	[ "$CONFIG_HAVE_ME_BIN" = "y" ] && inject IFD "$CONFIG_ME_BIN_PATH" me
+	[ "$CONFIG_KBC1126_FIRMWARE" = "y" ] && inject ecfw1.bin \
+	    "$CONFIG_KBC1126_FW1" raw "$CONFIG_KBC1126_FW1_OFFSET" && inject \
+	    ecfw2.bin "$CONFIG_KBC1126_FW2" raw "$CONFIG_KBC1126_FW2_OFFSET"
 	[ -n "$CONFIG_VGA_BIOS_FILE" ] && [ -n "$CONFIG_VGA_BIOS_ID" ] && \
 		inject "pci$CONFIG_VGA_BIOS_ID.rom" \
 		    "$CONFIG_VGA_BIOS_FILE" "optionrom"
 	[ "$CONFIG_INCLUDE_SMSC_SCH5545_EC_FW" = "y" ] && \
 	    [ -n "$CONFIG_SMSC_SCH5545_EC_FW_FILE" ] && \
-		inject "sch5545_ecfw.bin" "$CONFIG_SMSC_SCH5545_EC_FW_FILE" raw
-	[ "$modifygbe" = "true" ] && ! [ "$release" = "y" ] && \
-		inject "IFD" "$CONFIG_GBE_BIN_PATH" "GbE"
+		inject sch5545_ecfw.bin "$CONFIG_SMSC_SCH5545_EC_FW_FILE" raw
+	[ -n "$new_mac" ] && [ "$vrelease" != "y" ] && modify_gbe "$rom"
 
 	printf "ROM image successfully patched: %s\n" "$rom"
 }
@@ -389,50 +338,39 @@ patch_rom()
 inject()
 {
 	[ $# -lt 3 ] && $err "$@, $rom: usage: inject name path type (offset)"
+	[ "$2" = "/dev/null" ] && return 0; verify="y"
 
 	eval `setvars "" cbfsname _dest _t _offset`
-	cbfsname="$1"
-	_dest="${2##*../}"
-	_t="$3"
+	cbfsname="$1"; _dest="${2##*../}"; _t="$3"
+
 	[ $# -gt 3 ] && _offset="-b $4" && [ -z "$4" ] && \
 	    $err "inject $@, $rom: offset passed, but empty (not defined)"
 
-	[ -z "$_dest" ] && $err "inject $@, $rom: empty destination path"
-	[ ! -f "$_dest" ] && [ "$nukemode" != "nuke" ] && \
-		$err "inject_$dl_type: file missing, $_dest"
+	e "$_dest" f n && [ "$nukemode" != "nuke" ] && $err "!inject $dl_type"
 
-	[ "$nukemode" = "nuke" ] || \
-		printf "Inserting %s/%s into: %s\n" "$cbfsname" "$_t" "$rom"
-
-	if [ "$_t" = "GbE" ]; then
-		x_ mkdir -p tmp
-		cp "$_dest" "tmp/gbe.bin" || \
-		    $err "inject: !cp \"$_dest\" \"tmp/gbe.bin\""
-		_dest="tmp/gbe.bin"
-		"$nvmutil" "$_dest" setmac "$new_mac" || \
-		    $err "inject $_dest: can't change mac address"
-	fi
 	if [ "$cbfsname" = "IFD" ]; then
-		if [ "$nukemode" != "nuke" ]; then
-			"$ifdtool" -i $_t:$_dest "$rom" -O "$rom" || \
-			    $err "inject: can't insert $_t ($dest) into $rom"
-		else
-			"$ifdtool" --nuke $_t "$rom" -O "$rom" || \
-			    $err "inject $rom: can't nuke $_t in IFD"
-		fi
-	else
-		if [ "$nukemode" != "nuke" ]; then
-			if [ "$_t" = "stage" ]; then # broadwell refcode
-				"$cbfstool" "$rom" add-stage -f "$_dest" \
-				    -n "$cbfsname" -t stage -c lzma
-			else
-				"$cbfstool" "$rom" add -f "$_dest" \
-				    -n "$cbfsname" -t $_t $_offset || \
-				    $err "$rom: can't insert $_t file $_dest"
-			fi
-		else
-			"$cbfstool" "$rom" remove -n "$cbfsname" || \
-			    $err "inject $rom: can't remove $cbfsname"
-		fi
+		[ "$nukemode" = "nuke" ] || "$ifdtool" -i $_t:$_dest "$rom" \
+		    -O "$rom" || $err "failed: inject '$_t' '$_dest' on '$rom'"
+		[ "$nukemode" != "nuke" ] || "$ifdtool" --nuke $_t "$rom" \
+		    -O "$rom" || $err "$rom: can't nuke $_t in IFD"; return 0
+	elif [ "$nukemode" = "nuke" ]; then
+		"$cbfstool" "$rom" remove -n "$cbfsname" || \
+		    $err "inject $rom: can't remove $cbfsname"; return 0
 	fi
+	[ "$_t" != "stage" ] || "$cbfstool" "$rom" add-stage -f \
+	    "$_dest" -n "$cbfsname" -t stage -c lzma || $err "$rom: !add ref"
+	[ "$_t" = "stage" ] || "$cbfstool" "$rom" add -f "$_dest" \
+	    -n "$cbfsname" -t $_t $_offset || $err "$rom !add $_t ($_dest)"
+}
+
+modify_gbe()
+{
+	chkvars CONFIG_GBE_BIN_PATH
+
+	e "${CONFIG_GBE_BIN_PATH##*../}" f n && $err "missing gbe file"
+	x_ make -C util/nvmutil
+
+	x_ cp "${CONFIG_GBE_BIN_PATH##*../}" "$TMPDIR/gbe"
+	x_ "util/nvmutil/nvm" "$TMPDIR/gbe" setmac $new_mac
+	x_ "$ifdtool" -i GbE:"$TMPDIR/gbe" "$1" -O "$1"
 }