diff options
| author | Fred Reitberger <reitbergerfred@gmail.com> | 2023-05-05 13:40:50 -0400 |
|---|---|---|
| committer | Martin L Roth <gaumless@gmail.com> | 2023-06-02 20:14:26 +0000 |
| commit | 9d6008ea5b5acf142f73f3d485c2c196d8a88a59 (patch) | |
| tree | 3cc28e88b035d966081379377f81e7402a4c1993 | |
| parent | f14d208eb03d735e5581824c5e7f11b346b936ca (diff) | |
amdfwtool: Only use AMD_FW_RECOVERYAB_A on phoenix
BUG=285390041
Signed-off-by: Fred Reitberger <reitbergerfred@gmail.com>
Change-Id: I4321c6a8553b470096aec263fb4b15b831efae7f
Reviewed-on: https://review.coreboot.org/c/coreboot/+/74971
Reviewed-by: Tim Van Patten <timvp@google.com>
Reviewed-by: Jon Murphy <jpmurphy@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | util/amdfwtool/amdfwtool.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index 275e49d707..1b2b0054b5 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -982,6 +982,7 @@ static void integrate_psp_firmwares(context *ctx, uint32_t current_table_save; bool recovery_ab = cb_config->recovery_ab; ish_directory_table *ish_a_dir = NULL, *ish_b_dir = NULL; + bool use_only_a = (cb_config->soc_id == PLATFORM_PHOENIX); /* TODO: b:285390041 */ /* This function can create a primary table, a secondary table, or a * flattened table which contains all applicable types. These if-else @@ -1116,10 +1117,12 @@ static void integrate_psp_firmwares(context *ctx, AMD_FW_RECOVERYAB_A, cb_config->soc_id); if (pspdir2_b != NULL) integrate_psp_ab(ctx, pspdir, pspdir2_b, ish_b_dir, - AMD_FW_RECOVERYAB_B, cb_config->soc_id); + use_only_a ? AMD_FW_RECOVERYAB_A : AMD_FW_RECOVERYAB_B, + cb_config->soc_id); else integrate_psp_ab(ctx, pspdir, pspdir2, ish_a_dir, - AMD_FW_RECOVERYAB_B, cb_config->soc_id); + use_only_a ? AMD_FW_RECOVERYAB_A : AMD_FW_RECOVERYAB_B, + cb_config->soc_id); count = pspdir->header.num_entries; } else if (pspdir2 != NULL) { |