From bd9dd420d7e0e5c2acb4073c0f4b3faec4d31ec8 Mon Sep 17 00:00:00 2001 From: Karthikeyan Ramasubramanian Date: Thu, 22 Dec 2022 15:45:56 -0700 Subject: util/amdfwtool: Add option to indicate uncompressed BIOS binary amdfwtool always assumes that the PSP BIOS binary (type 0x62 BIOS directory entry) is always compressed. On boards using vboot, sometimes PSP BIOS binary is uncompressed - specifically when CBFS verification is enabled and verified boot starts in bootblock. Add an option to indicate PSP BIOS binary is uncompressed. BUG=b:261792282 TEST=Build Skyrim BIOS with x86 verstage and CBFS Verification enabled. Boot to OS. Change-Id: I4d56c0ba451b194043ebb5cdb0f2b27482beef1f Signed-off-by: Karthikeyan Ramasubramanian Reviewed-on: https://review.coreboot.org/c/coreboot/+/71210 Tested-by: build bot (Jenkins) Reviewed-by: Martin L Roth Reviewed-by: Paul Menzel --- util/amdfwtool/amdfwtool.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index adcde9424a..53cfa77863 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -1844,6 +1844,7 @@ enum { AMDFW_OPT_BIOSBIN_SOURCE, AMDFW_OPT_BIOSBIN_DEST, AMDFW_OPT_BIOS_UNCOMP_SIZE, + AMDFW_OPT_BIOSBIN_UNCOMP, AMDFW_OPT_UCODE, AMDFW_OPT_APOB_NVBASE, AMDFW_OPT_APOB_NVSIZE, @@ -1899,6 +1900,7 @@ static struct option long_options[] = { {"bios-bin-src", required_argument, 0, AMDFW_OPT_BIOSBIN_SOURCE }, {"bios-bin-dest", required_argument, 0, AMDFW_OPT_BIOSBIN_DEST }, {"bios-uncomp-size", required_argument, 0, AMDFW_OPT_BIOS_UNCOMP_SIZE }, + {"bios-bin-uncomp", no_argument, 0, AMDFW_OPT_BIOSBIN_UNCOMP }, {"bios-sig-size", required_argument, 0, LONGOPT_BIOS_SIG }, {"ucode", required_argument, 0, AMDFW_OPT_UCODE }, {"apob-nv-base", required_argument, 0, AMDFW_OPT_APOB_NVBASE }, @@ -2188,6 +2190,7 @@ int main(int argc, char **argv) while (1) { int optindex = 0; + int bios_tbl_index = -1; c = getopt_long(argc, argv, optstring, long_options, &optindex); @@ -2285,6 +2288,11 @@ int main(int argc, char **argv) register_bios_fw_addr(AMD_BIOS_BIN, 0, 0, optarg); sub = instance = 0; break; + case AMDFW_OPT_BIOSBIN_UNCOMP: + bios_tbl_index = find_bios_entry(AMD_BIOS_BIN); + if (bios_tbl_index != -1) + amd_bios_table[bios_tbl_index].zlib = 0; + break; case LONGOPT_BIOS_SIG: /* BIOS signature size */ register_bios_fw_addr(AMD_BIOS_SIG, 0, 0, optarg); -- cgit v1.2.3