[coreboot-gerrit] Change in coreboot[master]: util/amdfwtool: select A/B recovery when ISH is used

[Felix Held (Code Review)]

Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/63184 )

Change subject: util/amdfwtool: select A/B recovery when ISH is used
......................................................................

util/amdfwtool: select A/B recovery when ISH is used

In newer AMD SoCs, the image slot header is used in the AMD A/B recovery
scheme, so set recovery_ab to true when need_ish is true. Also move the
block of code before the process_config call, since that call will
already use the recovery_ab field of the cb_config struct.

Signed-off-by: Felix Held 
Change-Id: I65903765514f215bf5cc9b949d0b95aff781eb34
---
M util/amdfwtool/amdfwtool.c
1 file changed, 8 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/63184/1

diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index 9e7f920..c425676 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -1684,6 +1684,14 @@
    	}
    }

+	if (cb_config.need_ish) {
+		cb_config.recovery_ab = true;
+	}
+
+	if (cb_config.recovery_ab) {
+		cb_config.multi_level = true;
+	}
+
    if (config) {
    	config_handle = fopen(config, "r");
    	if (config_handle == NULL) {
@@ -1724,10 +1732,6 @@
    	retval = 1;
    }

-	if (cb_config.recovery_ab) {
-		cb_config.multi_level = true;
-	}
-
    if (retval) {
    	usage();
    	return retval;