[coreboot-gerrit] [XS] Change in coreboot[main]: DEMO:amdfwtool: both a/b. not only a

[Bao Zheng (Code Review)]

Attention is currently required from: Felix Held, Fred Reitberger, Jason Glenesk, Matt DeVillier, Zheng Bao.

Hello Zheng Bao,

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

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

to review the following change.

Change subject: DEMO:amdfwtool: both a/b. not only a
......................................................................

DEMO:amdfwtool: both a/b. not only a

Change-Id: Ia6c93755012b4bcf5513020e06071f67e317e992
Signed-off-by: Zheng Bao 
---
M src/soc/amd/phoenix/Makefile.mk
M util/amdfwtool/amdfwtool.c
M util/amdfwtool/opts.c
3 files changed, 3 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/84257/1

diff --git a/src/soc/amd/phoenix/Makefile.mk b/src/soc/amd/phoenix/Makefile.mk
index 7713fad..403bfda 100644
--- a/src/soc/amd/phoenix/Makefile.mk
+++ b/src/soc/amd/phoenix/Makefile.mk
@@ -231,7 +231,7 @@
 OPT_SPL_RW_AB_TABLE_FILE=$(call add_opt_prefix, $(SPL_RW_AB_TABLE_FILE), --spl-table)

# If vboot uses 2 RW slots, then 2 copies of PSP binaries are redundant
-OPT_RECOVERY_AB_SINGLE_COPY=$(if $(CONFIG_VBOOT_SLOTS_RW_AB), --recovery-ab-single-copy)
+#OPT_RECOVERY_AB_SINGLE_COPY=$(if $(CONFIG_VBOOT_SLOTS_RW_AB), --recovery-ab-single-copy)

OPT_AMDFW_BODY_LOCATION=$(call add_opt_prefix, $(FMAP_AMDFW_BODY_LOCATION), --body-location)

diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index 0dd60cc..a8a6ad7 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -893,7 +893,7 @@
    bool recovery_ab = cb_config->recovery_ab;
    unsigned int count;
    psp_directory_table *pspdir, *pspdir2, *pspdir2_b;
-	bool use_only_a = (cb_config->soc_id == PLATFORM_PHOENIX); /* TODO: b:285390041 */
+	bool use_only_a = false;//(cb_config->soc_id == PLATFORM_PHOENIX); /* TODO: b:285390041 */

pspdir = ctx->pspdir;
    pspdir2 = ctx->pspdir2;
diff --git a/util/amdfwtool/opts.c b/util/amdfwtool/opts.c
index 62bbc97..8b514ce 100644
--- a/util/amdfwtool/opts.c
+++ b/util/amdfwtool/opts.c
@@ -380,7 +380,7 @@
    		break;
    	case AMDFW_OPT_RECOVERY_AB_SINGLE_COPY:
    		cb_config->recovery_ab = true;
-			cb_config->recovery_ab_single_copy = true;
+			//cb_config->recovery_ab_single_copy = true;
    		break;
    	case AMDFW_OPT_USE_COMBO:
    		cb_config->use_combo = true;