[XS] Change in coreboot[master]: amdfwtool: Only use AMD_FW_RECOVERYAB_A on phoenix

[Martin L Roth (Code Review)]

Martin L Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/74971?usp=email )

Change subject: amdfwtool: Only use AMD_FW_RECOVERYAB_A on phoenix
......................................................................

amdfwtool: Only use AMD_FW_RECOVERYAB_A on phoenix

BUG=285390041

Signed-off-by: Fred Reitberger 
Change-Id: I4321c6a8553b470096aec263fb4b15b831efae7f
Reviewed-on: https://review.coreboot.org/c/coreboot/+/74971
Reviewed-by: Tim Van Patten 
Reviewed-by: Jon Murphy 
Tested-by: build bot (Jenkins) 
---
M util/amdfwtool/amdfwtool.c
1 file changed, 5 insertions(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Jon Murphy: Looks good to me, approved
  Tim Van Patten: Looks good to me, approved

diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index 275e49d..1b2b005 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -982,6 +982,7 @@
    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 @@
    		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) {