GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <fishbaozi@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/66855
Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Zheng Bao 2022-08-18 15:52:31 +08:00 committed by Fred Reitberger
parent b2ae6a5a3a
commit 35cdffd6ea
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/amdfwtool/amdfwtool.c
View File

@ -2621,9 +2621,9 @@ int main(int argc, char **argv)
amd_psp_fw_table, PSP_COOKIE, &cb_config); amd_psp_fw_table, PSP_COOKIE, &cb_config);
} }
fill_psp_directory_to_efs(amd_romsig, pspdir, &ctx, &cb_config); if (!cb_config.use_combo) {
fill_psp_directory_to_efs(amd_romsig, pspdir, &ctx, &cb_config);
if (cb_config.use_combo) { } else {
fill_psp_directory_to_efs(amd_romsig, psp_combo_dir, &ctx, &cb_config); fill_psp_directory_to_efs(amd_romsig, psp_combo_dir, &ctx, &cb_config);
/* 0 -Compare PSP ID, 1 -Compare chip family ID */ /* 0 -Compare PSP ID, 1 -Compare chip family ID */
psp_combo_dir->entries[0].id_sel = 0; psp_combo_dir->entries[0].id_sel = 0;