summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2022-03-29 23:10:45 +0200
committerFelix Held <felix-coreboot@felixheld.de>2022-03-30 22:20:04 +0000
commit21a8e381ea0dcf650200d2722bf2574958e5c9c7 (patch)
treec6f52ed742295dadd5833ebd994edf36cdc4bcf2
parent1d8c7da5b4bd8eac56c78529d9fdfa52658d6862 (diff)
util/amdfwtool: use table-relative addressing in ISH case
When the image slot header (ISH) is used, the addresses in the PSP and BIOS directory tables need to be relative to the beginning of the table. Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Change-Id: Ia61f7c8313d5a1af95c68b9177a53a2f5443552a Reviewed-on: https://review.coreboot.org/c/coreboot/+/63183 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Raul Rangel <rrangel@chromium.org>
-rw-r--r--util/amdfwtool/amdfwtool.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index 0cfe307b2f..9e7f920487 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -1798,7 +1798,9 @@ int main(int argc, char **argv)
fprintf(stderr, "WARNING: No SOC name specified.\n");
}
- if (amd_romsig->efs_gen.gen == EFS_SECOND_GEN)
+ if (cb_config.need_ish)
+ ctx.address_mode = ADDRESS_MODE_2_REL_TAB;
+ else if (amd_romsig->efs_gen.gen == EFS_SECOND_GEN)
ctx.address_mode = ADDRESS_MODE_1_REL_BIOS;
else
ctx.address_mode = ADDRESS_MODE_0_PHY;