From e5af14ace60f378ff536741e636bdeb8df48f072 Mon Sep 17 00:00:00 2001 From: Karthikeyan Ramasubramanian Date: Tue, 2 Aug 2022 11:34:48 -0600 Subject: util/amdfwtool: Fix ISH_B directory offset On boards which use both PSP recovery A/B layout as well as VBOOT A/B layout, ISH_B directory entry is pointing directly to PSP Level2 directory. This is not correct and either ISH_B should be marked as not present or it should point to the ISH_A directory itself which in turn point to PSP L2 directory. Fix it by choosing the latter option. BUG=None TEST=Build and boot to OS in Skyrim with PSP verstage. Signed-off-by: Karthikeyan Ramasubramanian Change-Id: I0a7a56e98de3f85669ff8ec2fcd1687aa33576a9 Reviewed-on: https://review.coreboot.org/c/coreboot/+/66445 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held --- util/amdfwtool/amdfwtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index bc825ed9b048..6cd20b7530fb 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -852,7 +852,7 @@ static void integrate_psp_firmwares(context *ctx, integrate_psp_ab(ctx, pspdir, pspdir2_b, ish_b_dir, AMD_FW_RECOVERYAB_B, soc_id); else - integrate_psp_ab(ctx, pspdir, pspdir2, ish_b_dir, + integrate_psp_ab(ctx, pspdir, pspdir2, ish_a_dir, AMD_FW_RECOVERYAB_B, soc_id); count = pspdir->header.num_entries; -- cgit v1.2.3