[coreboot-gerrit] [XS] Change in coreboot[master]: WIP:Revert "amdfwtool: Only use AMD_FW_RECOVERYAB_A on phoenix"

[Bao Zheng (Code Review)]

Attention is currently required from: Zheng Bao.

Hello Zheng Bao,

I'd like you to do a code review.
Please visit

https://review.coreboot.org/c/coreboot/+/75683?usp=email

to review the following change.

Change subject: WIP:Revert "amdfwtool: Only use AMD_FW_RECOVERYAB_A on phoenix"
......................................................................

WIP:Revert "amdfwtool: Only use AMD_FW_RECOVERYAB_A on phoenix"

This reverts commit 9d6008ea5b5acf142f73f3d485c2c196d8a88a59.

BUG=285390041

Change-Id: I0474d6e751158d5e3c2199465266ce1af4b4f29d
Signed-off-by: Zheng Bao 
---
M util/amdfwtool/amdfwtool.c
1 file changed, 2 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/75683/1

diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index 3dc113d..b61348c 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -995,7 +995,6 @@
    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
@@ -1130,12 +1129,10 @@
    		AMD_FW_RECOVERYAB_A, cb_config->soc_id);
    	if (pspdir2_b != NULL)
    		integrate_psp_ab(ctx, pspdir, pspdir2_b, ish_b_dir,
-				use_only_a ? AMD_FW_RECOVERYAB_A : AMD_FW_RECOVERYAB_B,
-				cb_config->soc_id);
+				AMD_FW_RECOVERYAB_B, cb_config->soc_id);
    	else
    		integrate_psp_ab(ctx, pspdir, pspdir2, ish_a_dir,
-				use_only_a ? AMD_FW_RECOVERYAB_A : AMD_FW_RECOVERYAB_B,
-				cb_config->soc_id);
+				AMD_FW_RECOVERYAB_B, cb_config->soc_id);

count = pspdir->header.num_entries;
    } else if (pspdir2 != NULL) {