sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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:
Felix Held 2022-03-29 23:28:10 +02:00
parent 879a2789ee
commit 830add6e27
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
util/amdfwtool/amdfwtool.c
View File

@ -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) { if (config) {
config_handle = fopen(config, "r"); config_handle = fopen(config, "r");
if (config_handle == NULL) { if (config_handle == NULL) {
@ -1724,10 +1730,6 @@ int main(int argc, char **argv)
retval = 1; retval = 1;
} }
if (cb_config.recovery_ab) {
cb_config.multi_level = true;
}
if (retval) { if (retval) {
usage(); usage();
return retval; return retval;