diff options
| author | Zheng Bao <fishbaozi@gmail.com> | 2022-08-18 15:52:31 +0800 |
|---|---|---|
| committer | Fred Reitberger <reitbergerfred@gmail.com> | 2023-03-08 12:56:37 +0000 |
| commit | 35cdffd6eaefbe60234ee22d7b97f5c1d5945606 (patch) | |
| tree | fa4c4ce7cbd2a409e6b1ebbebda37ad22c371106 | |
| parent | b2ae6a5a3a22d45f27e649d24777ae36f031f0ee (diff) | |
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>
| -rw-r--r-- | util/amdfwtool/amdfwtool.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |