[S] Change in coreboot[master]: util/amdfwtool: Add option to indicate uncompressed BIOS binary

[Karthik Ramasubramanian (Code Review)]

Karthik Ramasubramanian has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/71210 )

Change subject: util/amdfwtool: Add option to indicate uncompressed BIOS binary
......................................................................

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 
---
M util/amdfwtool/amdfwtool.c
1 file changed, 28 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/71210/1

diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index e28d9c4..74e502b 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -1689,6 +1689,7 @@
    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,
@@ -1745,6 +1746,7 @@
    {"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 },
@@ -2032,6 +2034,7 @@

while (1) {
    	int optindex = 0;
+		int bios_tbl_index = -1;

c = getopt_long(argc, argv, optstring, long_options, &optindex);

@@ -2132,6 +2135,11 @@
    		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);