diff options
| author | Leah Rowe <leah@libreboot.org> | 2024-06-28 13:38:43 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2024-06-28 13:38:43 +0100 |
| commit | d0f68a0fbf7685cbc471b64633adb060944549ff (patch) | |
| tree | 91226e6200303baa83e14c25ea4ad42e783319d3 | |
| parent | 473f2778457b9a9e523cda11b50653518e837b46 (diff) | |
vendor.sh: rename release to vrelease
also remove inject_vendorfiles() and merge it
into vendor_download()
the "release" variable is included in some target.cfg
files, which we put in config/coreboot/ and handle
here, so they could conflict with the release variable
used in vendor.sh, used for a different purpose. therefore,
rename it to "vrelease".
Signed-off-by: Leah Rowe <leah@libreboot.org>
| -rwxr-xr-x | include/vendor.sh | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/include/vendor.sh b/include/vendor.sh index 8f4daeed..a14fbaef 100755 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -21,10 +21,10 @@ eval `setvars "" EC_url_bkup EC_hash DL_hash DL_url_bkup MRC_refcode_gbe vcfg \ 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_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 cbdir boarddir` + CONFIG_REFCODE_BLOB_FILE vrelease boarddir` vendor_download() { @@ -246,7 +246,9 @@ vendor_inject() check_board build_dependencies_inject - inject_vendorfiles + [ "$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" @@ -262,7 +264,7 @@ check_board() [ -z "${rom+x}" ] && $err "check_board: no rom specified" [ -n "${board+x}" ] || board="$(detect_board "$rom")" else - release="y" + vrelease="y" board="$(detect_board "$archive")" fi readcfg @@ -315,12 +317,6 @@ build_dependencies_inject() [ "$nukemode" = "nuke" ] || x_ ./vendor download $board; return 0 } -inject_vendorfiles() -{ - [ "$release" != "y" ] && eval "patch_rom \"$rom\"; return 0" - patch_release_roms -} - patch_release_roms() { _tmpdir="tmp/romdir" @@ -378,7 +374,7 @@ patch_rom() [ "$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" ] && \ + [ "$modifygbe" = "true" ] && ! [ "$vrelease" = "y" ] && \ inject "IFD" "$CONFIG_GBE_BIN_PATH" "GbE" printf "ROM image successfully patched: %s\n" "$rom" |