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 <felix-coreboot@felixheld.de> Change-Id: I65903765514f215bf5cc9b949d0b95aff781eb34 Reviewed-on: https://review.coreboot.org/c/coreboot/+/63184 Reviewed-by: Raul Rangel <rrangel@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
		@@ -1684,6 +1684,12 @@ int main(int argc, char **argv)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	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 +1730,6 @@ int main(int argc, char **argv)
 | 
			
		||||
		retval = 1;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (cb_config.recovery_ab) {
 | 
			
		||||
		cb_config.multi_level = true;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (retval) {
 | 
			
		||||
		usage();
 | 
			
		||||
		return retval;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user