From 35cdffd6eaefbe60234ee22d7b97f5c1d5945606 Mon Sep 17 00:00:00 2001 From: Zheng Bao Date: Thu, 18 Aug 2022 15:52:31 +0800 Subject: amdfwtool: Separate two cases of combo and non-combo clearly If combo is used, fill the EFS header with address of COMBO header. If not, fill with address of PSP header. The old code fills with PSP headers all the time. Change-Id: I0057165aea553d9dc8e4e719e2804557229a0002 Signed-off-by: Zheng Bao Reviewed-on: https://review.coreboot.org/c/coreboot/+/66855 Reviewed-by: Fred Reitberger Tested-by: build bot (Jenkins) --- util/amdfwtool/amdfwtool.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'util/amdfwtool') diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index 9b523fcc27..c62ad2b9d4 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -2621,9 +2621,9 @@ int main(int argc, char **argv) amd_psp_fw_table, PSP_COOKIE, &cb_config); } - fill_psp_directory_to_efs(amd_romsig, pspdir, &ctx, &cb_config); - - if (cb_config.use_combo) { + if (!cb_config.use_combo) { + fill_psp_directory_to_efs(amd_romsig, pspdir, &ctx, &cb_config); + } else { fill_psp_directory_to_efs(amd_romsig, psp_combo_dir, &ctx, &cb_config); /* 0 -Compare PSP ID, 1 -Compare chip family ID */ psp_combo_dir->entries[0].id_sel = 0; -- cgit v1.2.3