coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-20 15:03:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

vendor.sh: rename release to vrelease

Browse Source 
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>
This commit is contained in:
Leah Rowe
2024-06-28 13:38:43 +01:00
parent 473f277845
commit d0f68a0fbf
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/vendor.sh
+7 -11
View File
@@ -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_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_ME_BIN_PATH CONFIG_KBC1126_FIRMWARE _dest tree CONFIG_GBE_BIN_PATH \
CONFIG_KBC1126_FW1_OFFSET CONFIG_KBC1126_FW2 CONFIG_KBC1126_FW2_OFFSET \ 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_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_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() vendor_download()
{ {
@@ -246,7 +246,9 @@ vendor_inject()
check_board check_board
build_dependencies_inject build_dependencies_inject
inject_vendorfiles [ "$vrelease" != "y" ] && patch_rom "$rom"
[ "$vrelease" = "y" ] && patch_release_roms
[ "$nukemode" = "nuke" ] && return 0 [ "$nukemode" = "nuke" ] && return 0
printf "Friendly reminder (this is *not* an error message):\n" printf "Friendly reminder (this is *not* an error message):\n"
printf "Please ensure that the files were inserted correctly. ALSO:\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" [ -z "${rom+x}" ] && $err "check_board: no rom specified"
[ -n "${board+x}" ] || board="$(detect_board "$rom")" [ -n "${board+x}" ] || board="$(detect_board "$rom")"
else else
release="y" vrelease="y"
board="$(detect_board "$archive")" board="$(detect_board "$archive")"
fi fi
readcfg readcfg
@@ -315,12 +317,6 @@ build_dependencies_inject()
[ "$nukemode" = "nuke" ] || x_ ./vendor download $board; return 0 [ "$nukemode" = "nuke" ] || x_ ./vendor download $board; return 0
} }
inject_vendorfiles()
{
[ "$release" != "y" ] && eval "patch_rom \"$rom\"; return 0"
patch_release_roms
}
patch_release_roms() patch_release_roms()
{ {
_tmpdir="tmp/romdir" _tmpdir="tmp/romdir"
@@ -378,7 +374,7 @@ patch_rom()
[ "$CONFIG_INCLUDE_SMSC_SCH5545_EC_FW" = "y" ] && \ [ "$CONFIG_INCLUDE_SMSC_SCH5545_EC_FW" = "y" ] && \
[ -n "$CONFIG_SMSC_SCH5545_EC_FW_FILE" ] && \ [ -n "$CONFIG_SMSC_SCH5545_EC_FW_FILE" ] && \
inject "sch5545_ecfw.bin" "$CONFIG_SMSC_SCH5545_EC_FW_FILE" raw 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" inject "IFD" "$CONFIG_GBE_BIN_PATH" "GbE"
printf "ROM image successfully patched: %s\n" "$rom" printf "ROM image successfully patched: %s\n" "$rom"