[coreboot-gerrit] [XS] Change in coreboot[main]: amdfwtool: Do not use combo bios dir for recovery A/B mode

[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/+/81137?usp=email

to review the following change.

Change subject: amdfwtool: Do not use combo bios dir for recovery A/B mode
......................................................................

amdfwtool: Do not use combo bios dir for recovery A/B mode

For recovery A/B mode, the BIOS tables level 2 are traced by PSP table
instead of ROMSIG. There should not be a dedicated BIOS table, nor a
combo BIOS table.

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

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/81137/1

diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index e81059d..7e30804 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -1604,7 +1604,8 @@

adjust_current_pointer(&ctx, 0, 0x1000U);

-		bhd_combo_dir = new_combo_dir(&ctx);
+		if (!cb_config.recovery_ab)
+			bhd_combo_dir = new_combo_dir(&ctx);
    }

combo_index = 0;
@@ -1728,7 +1729,7 @@
    		if (!cb_config.use_combo) {
    			fill_bios_directory_to_efs(amd_romsig, biosdir,
    				&ctx, &cb_config);
-			} else {
+			} else if (bhd_combo_dir != NULL) {
    			fill_bios_directory_to_efs(amd_romsig, bhd_combo_dir,
    				&ctx, &cb_config);
    			assert_fw_entry(combo_index, MAX_COMBO_ENTRIES, &ctx);