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

amdfwtool: Remove the dissociated combo BIOS table for recovery A/B

Browse Source 
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 <fishbaozi@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/81137
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Zheng Bao
2024-03-09 10:56:06 +08:00
committed by Felix Held
parent 686d810092
commit d22c2c8772
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
util/amdfwtool/amdfwtool.c
View File

@@ -1600,7 +1600,8 @@ int main(int argc, char **argv)
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;
@@ -1723,7 +1724,10 @@ int main(int argc, char **argv)
if (!cb_config.use_combo) {
fill_bios_directory_to_efs(amd_romsig, biosdir,
&ctx, &cb_config);
} else {
} else if (bhd_combo_dir != NULL) {
/* In recovery A/B mode, there isn't a BHD combo directory.
* Instead, the BIOS tables level 2 are linked by PSP tables.
*/
fill_bios_directory_to_efs(amd_romsig, bhd_combo_dir,
&ctx, &cb_config);
assert_fw_entry(combo_index, MAX_COMBO_ENTRIES, &ctx);