summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarthikeyan Ramasubramanian <kramasub@google.com>2022-08-02 11:34:48 -0600
committerFelix Held <felix-coreboot@felixheld.de>2022-08-09 16:44:47 +0000
commite5af14ace60f378ff536741e636bdeb8df48f072 (patch)
tree515f6e17371f5af52f3610d41fea7f79839e3cec
parent5e80bcfaea530ebe7e64b520ed0727daeb73a187 (diff)
downloadcoreboot-e5af14ace60f378ff536741e636bdeb8df48f072.tar.gz
coreboot-e5af14ace60f378ff536741e636bdeb8df48f072.tar.bz2
coreboot-e5af14ace60f378ff536741e636bdeb8df48f072.zip
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 <kramasub@google.com> Change-Id: I0a7a56e98de3f85669ff8ec2fcd1687aa33576a9 Reviewed-on: https://review.coreboot.org/c/coreboot/+/66445 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
-rw-r--r--util/amdfwtool/amdfwtool.c2
1 files changed, 1 insertions, 1 deletions
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;