diff options
Diffstat (limited to 'include/vendor.sh')
| -rw-r--r--[-rwxr-xr-x] | include/vendor.sh | 374 |
1 files changed, 160 insertions, 214 deletions
diff --git a/include/vendor.sh b/include/vendor.sh index b5fda8f3..c5b6560d 100755..100644 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -3,90 +3,73 @@ # 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" -eval "$(setvars "" _b EC_url_bkup EC_hash DL_hash DL_url_bkup MRC_refcode_gbe \ +cv="CONFIG_HAVE_ME_BIN CONFIG_ME_BIN_PATH CONFIG_INCLUDE_SMSC_SCH5545_EC_FW \ + CONFIG_SMSC_SCH5545_EC_FW_FILE CONFIG_KBC1126_FIRMWARE CONFIG_KBC1126_FW1 \ + CONFIG_KBC1126_FW2 CONFIG_KBC1126_FW1_OFFSET CONFIG_KBC1126_FW2_OFFSET \ + CONFIG_VGA_BIOS_FILE CONFIG_VGA_BIOS_ID CONFIG_BOARD_DELL_E6400 \ + CONFIG_HAVE_MRC CONFIG_MRC_FILE CONFIG_HAVE_REFCODE_BLOB \ + CONFIG_REFCODE_BLOB_FILE CONFIG_GBE_BIN_PATH CONFIG_IFD_BIN_PATH" + +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 \ + E6400_VGA_romname SCH5545EC_DL_url_bkup SCH5545EC_DL_hash _dest tree \ 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_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_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)" + archive EC_url boarddir rom cbdir DL_url nukemode cbfstoolref vrelease \ + verify _7ztest ME_bootguard $cv` vendor_download() { - export PATH="$PATH:/sbin" - - [ $# -gt 0 ] || $err "No argument given" - board="$1" - boarddir="$cbcfgsdir/$board" - _b="${board%%_*mb}" # shorthand (no duplication per rom size) - - detect_firmware && exit 0 - scan_config "$_b" "config/vendor" - - build_dependencies_download - download_vendorfiles + [ $# -gt 0 ] || $err "No argument given"; export PATH="$PATH:/sbin" + board="$1"; readcfg && readkconfig && bootstrap && getfiles; : } -detect_firmware() +readkconfig() { - [ -d "$boarddir" ] || $err "Target '$board' not defined." - check_defconfig "$boarddir" 1>"$tmpdir/vendorcfg.list" && return 0 - while read -r cbcfgfile; do - set +u +e - . "$cbcfgfile" 2>/dev/null - set -u -e - done < "$tmpdir/vendorcfg.list" - . "$boarddir/target.cfg" 2>/dev/null + check_defconfig "$boarddir" 1>"$TMPDIR/vendorcfg.list" && return 1 - [ -z "$tree" ] && $err "detect_firmware $boarddir: tree undefined" - cbdir="src/coreboot/$tree" - cbfstool="elf/cbfstool/$tree/cbfstool" + rm -f "$TMPDIR/tmpcbcfg" || $err "!rm -f \"$TMPDIR/tmpcbcfg\"" + while read -r cbcfgfile; do + for cbc in $cv; do + rm -f "$TMPDIR/tmpcbcfg2" || \ + $err "!rm $TMPDIR/tmpcbcfg2" + grep "$cbc" "$cbcfgfile" 1>"$TMPDIR/tmpcbcfg2" \ + 2>/dev/null || : + [ -f "$TMPDIR/tmpcbcfg2" ] || continue + cat "$TMPDIR/tmpcbcfg2" >> "$TMPDIR/tmpcbcfg" || \ + $err "!cat $TMPDIR/tmpcbcfg2" + done + done < "$TMPDIR/vendorcfg.list" - mecleaner="$PWD/$cbdir/util/me_cleaner/me_cleaner.py" - kbc1126_ec_dump="$PWD/$cbdir/util/kbc1126/kbc1126_ec_dump" + eval `setcfg "$TMPDIR/tmpcbcfg"` for c in CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN CONFIG_KBC1126_FIRMWARE \ CONFIG_VGA_BIOS_FILE CONFIG_INCLUDE_SMSC_SCH5545_EC_FW; do eval "[ \"\${$c}\" = \"/dev/null\" ] && continue" - eval "[ -z \"\${$c}\" ] || return 1" + eval "[ -z \"\${$c}\" ] && continue" + eval `setcfg "config/vendor/$vcfg/pkg.cfg"`; return 0 done - printf "Vendor files not needed for: %s\n" "$board" 1>&2 + printf "Vendor files not needed for: %s\n" "$board" 1>&2; return 1 } -build_dependencies_download() +bootstrap() { - [ -d "$cbdir" ] || x_ ./update trees -f coreboot ${cbdir##*/} - for d in uefitool biosutilities bios_extract; do - [ -d "src/$d" ] && continue - x_ ./update trees -f "$d" - done - [ -f "$uefiextract" ] || x_ ./update trees -b uefitool - [ ! -d "${kbc1126_ec_dump%/*}" ] || [ -f "$kbc1126_ec_dump" ] || x_ \ - make -C "$cbdir/util/kbc1126" + x_ ./mk -f coreboot ${cbdir##*/} + mk -b uefitool biosutilities bios_extract + [ -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_ ./mk -d coreboot $MRC_refcode_cbtree; return 0 } -download_vendorfiles() +getfiles() { [ -z "$CONFIG_HAVE_ME_BIN" ] || fetch intel_me "$DL_url" \ "$DL_url_bkup" "$DL_hash" "$CONFIG_ME_BIN_PATH" @@ -95,58 +78,48 @@ download_vendorfiles() "$CONFIG_SMSC_SCH5545_EC_FW_FILE" [ -z "$CONFIG_KBC1126_FIRMWARE" ] || fetch kbc1126ec "$EC_url" \ "$EC_url_bkup" "$EC_hash" "$CONFIG_KBC1126_FW1" - [ -z "$CONFIG_VGA_BIOS_FILE" ] || fetch "e6400vga" \ - "$E6400_VGA_DL_url" "$E6400_VGA_DL_url_bkup" "$E6400_VGA_DL_hash" \ - "$CONFIG_VGA_BIOS_FILE" + [ -z "$CONFIG_VGA_BIOS_FILE" ] || fetch e6400vga "$E6400_VGA_DL_url" \ + "$E6400_VGA_DL_url_bkup" "$E6400_VGA_DL_hash" "$CONFIG_VGA_BIOS_FILE" [ -z "$CONFIG_HAVE_MRC" ] || fetch "mrc" "$MRC_url" "$MRC_url_bkup" \ "$MRC_hash" "$CONFIG_MRC_FILE"; return 0 } 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="$XBMK_CACHE/file/$dlsum" download "$dl" "$dl_bkup" "$_dl" "$dlsum" - x_ rm -Rf "${_dl}_extracted" - mkdirs "$_dest" "extract_$dl_type" || return 0 - eval "extract_$dl_type" - set -u -e + rm -Rf "${_dl}_extracted" || $err "!rm -Rf ${_ul}_extracted" + e "$_dest" f && return 0 - [ -f "$_dest" ] && return 0 - $err "extract_$dl_type (fetch): missing file: '$_dest'" -} + mkdir -p "${_dest%/*}" || $err "mkdirs: !mkdir -p ${_dest%/*}" + remkdir "$appdir"; extract_archive "$_dl" "$appdir" || \ + [ "$dl_type" = "e6400vga" ] || $err "mkd $_dest $dl_type: !extract" -mkdirs() -{ - e "$1" f && return 1 - - mkdir -p "${1%/*}" || $err "mkdirs: !mkdir -p ${1%/*}" - remkdir "$appdir" - extract_archive "$_dl" "$appdir" || [ "$2" = "extract_e6400vga" ] || \ - $err "mkdirs $1 $2: !extract"; return 0 + eval "extract_$dl_type"; set -u -e + e "$_dest" f missing && $err "!extract_$dl_type"; : } extract_intel_me() { e "$mecleaner" f not && $err "$cbdir: me_cleaner missing" - _me="$PWD/$_dest" # must always be an absolute path - cdir="$PWD/$appdir" # must always be an absolute path + _me="$PWD/$_dest"; cdir="$PWD/$appdir" + if [ "$ME_bootguard" = "me11disreguard" ]; then + # run mkukri's util to extract me.bin and disable bootguard + # for Dell OptiPlex 3050 Micro, using the deguard util. + extract_deguard_me "$cdir" "$_me" + return 0 + fi + # All other ME setups are extracted with brute force and me_cleaner: + [ $# -gt 0 ] && _me="${1}" && cdir="$2" e "$_me" f && return 0 - sdir="$(mktemp -d)" - [ -z "$sdir" ] && return 0 + sdir="$(mktemp -d)"; [ -z "$sdir" ] && return 0 mkdir -p "$sdir" || $err "extract_intel_me: !mkdir -p \"$sdir\"" set +u +e @@ -169,14 +142,36 @@ extract_intel_me() else continue fi - cdir="$1" - [ "${cdir#/a}" != "$cdir" ] && cdir="${cdir#/}" + cdir="$1"; [ "${cdir#/a}" != "$cdir" ] && cdir="${cdir#/}" cd "$cdir" || : done ) rm -Rf "$sdir" || $err "extract_intel_me: !rm -Rf $sdir" } +extract_deguard_me() +{ + x_ ./mk -f deguard + cp -R src/deguard "$1/disreguard" || \ + $err "Cannot make temporary deguard clone in $1/disreguard" + if [ ! -e "$1/disreguard/.git" ]; then + git -C "$1/disreguard" init || $err "!init $1/disreguard" + git -C "$1/disreguard" add -A . || $err "!add $1/disreguard" + git -C "$1/disreguard" commit -m "tmp" || \ + $err "!commit $1/disreguard" + fi + git -C "$1/disreguard" am config/data/deguard/appdir.patch || \ + $err "Cannot temporarily patch deguard clone in $1/disreguard" + ( + cd "$1/disreguard" || $err "Cannot cd to '$1/disreguard'" + x_ ./RUNME.sh + ) + "$mecleaner" --whitelist MFS --truncate "$1/disreguard/me.bin" || \ + $err "extract_intel_me: Can't truncate disreguarded ME" + cp "$cdir/disreguard/me.bin" "$2" || \ + $err "extract_intel_me: Can't move disreguarded me.bin" +} + extract_archive() { innoextract "$1" -d "$2" || python "$pfs_extract" "$1" -e || 7z x \ @@ -185,12 +180,10 @@ 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 + x_ cd "$appdir/"; mv Rompaq/68*.BIN ec.bin || : + 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 @@ -208,16 +201,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" @@ -238,51 +227,36 @@ extract_sch5545ec() vendor_inject() { - set +u +e - - [ $# -lt 1 ] && $err "No options specified." + set +u +e; [ $# -lt 1 ] && $err "No options specified." [ "$1" = "listboards" ] && eval "ls -1 config/coreboot || :; exit 0" - archive="$1" - - while getopts n:r:b:m: option; do + archive="$1"; while getopts n:r:b:m: option; do case "$option" in 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 - [ "$nukemode" = "nuke" ] && return 0 - printf "Friendly reminder (this is *not* an error message):\n" - printf "Please ensure that the files were inserted correctly.\n" + check_board || return 0 + [ "$nukemode" = "nuke" ] || x_ ./vendor download $board + [ "$vrelease" != "y" ] && patch_rom "$rom" + [ "$vrelease" = "y" ] && patch_release_roms; : } 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" - [ -d "$boarddir" ] || $err "check_board: board $board missing" - [ -f "$boarddir/target.cfg" ] || \ - $err "check_board $board: target.cfg missing" - . "$boarddir/target.cfg" 2>/dev/null - [ -z "$tree" ] && $err "check_board $board: tree undefined"; return 0 + readcfg || return 1; return 0 } check_release() @@ -296,100 +270,83 @@ check_release() # It will only succeed if the filename is not changed from the build/download detect_board() { - path="$1" - filename="$(basename "$path")" + path="$1"; filename="$(basename "$path")" case "$filename" in - grub_*) + grub_*|seagrub_*|custom_*) board="$(echo "$filename" | cut -d '_' -f2-3)" ;; seabios_withgrub_*) board="$(echo "$filename" | cut -d '_' -f3-4)" ;; - *.tar.xz) - _stripped_prefix="${filename#*_}" + *.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_ ./mk -d coreboot $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() { rom="$1" - - . "$(check_defconfig "$boarddir")" 2>/dev/null || exit 0 + readkconfig || exit 0 [ "$CONFIG_HAVE_MRC" = "y" ] && inject "mrc.bin" "$CONFIG_MRC_FILE" \ "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" + 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" } @@ -397,50 +354,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" - eval "$(setvars "" cbfsname _dest _t _offset)" - 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" - - [ "$nukemode" = "nuke" ] || \ - printf "Inserting %s/%s into: %s\n" "$cbfsname" "$_t" "$rom" + e "$_dest" f n && [ "$nukemode" != "nuke" ] && $err "!inject $dl_type" - 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" } |