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

amdfwtool: Use macro to get the table relative address

Browse Source 
TEST=Identical binary test on all AMD SOC platform

Change-Id: Iece4ba65e0476543a8d472168d93801714330dde
Signed-off-by: Zheng Bao <fishbaozi@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78281
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Zheng Bao
2023-10-09 18:35:27 +08:00
committed by Felix Held
parent df9a040e75
commit 757580081d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
util/amdfwtool/amdfwtool.c
View File

@ -846,7 +846,7 @@ static void integrate_psp_ab(context *ctx, psp_directory_table *pspdir,
uint32_t current_table_save; uint32_t current_table_save;
current_table_save = ctx->current_table; current_table_save = ctx->current_table;
ctx->current_table = (char *)pspdir - ctx->rom; ctx->current_table = BUFF_TO_RUN_MODE(*ctx, pspdir, AMD_ADDR_REL_BIOS);
count = pspdir->header.num_entries; count = pspdir->header.num_entries;
assert_fw_entry(count, MAX_PSP_ENTRIES, ctx); assert_fw_entry(count, MAX_PSP_ENTRIES, ctx);
pspdir->entries[count].type = (uint8_t)ab; pspdir->entries[count].type = (uint8_t)ab;
@ -982,7 +982,7 @@ static void integrate_psp_firmwares(context *ctx,
level = PSP_BOTH_AB; level = PSP_BOTH_AB;
} }
current_table_save = ctx->current_table; current_table_save = ctx->current_table;
ctx->current_table = (char *)pspdir - ctx->rom; ctx->current_table = BUFF_TO_RUN_MODE(*ctx, pspdir, AMD_ADDR_REL_BIOS);
adjust_current_pointer(ctx, 0, TABLE_ALIGNMENT); adjust_current_pointer(ctx, 0, TABLE_ALIGNMENT);
for (i = 0, count = 0; fw_table[i].type != AMD_FW_INVALID; i++) { for (i = 0, count = 0; fw_table[i].type != AMD_FW_INVALID; i++) {
@ -1092,7 +1092,7 @@ static void add_psp_firmware_entry(context *ctx,
uint32_t current_table_save; uint32_t current_table_save;
current_table_save = ctx->current_table; current_table_save = ctx->current_table;
ctx->current_table = (char *)pspdir - ctx->rom; ctx->current_table = BUFF_TO_RUN_MODE(*ctx, pspdir, AMD_ADDR_REL_BIOS);
/* If there is an entry of "type", replace it. */ /* If there is an entry of "type", replace it. */
for (index = 0; index < count; index++) { for (index = 0; index < count; index++) {
@ -1222,7 +1222,7 @@ static void integrate_bios_levels(context *ctx, amd_cb_config *cb_config)
TABLE_ALIGNMENT); TABLE_ALIGNMENT);
} else if (ctx->biosdir2) { } else if (ctx->biosdir2) {
current_table_save = ctx->current_table; current_table_save = ctx->current_table;
ctx->current_table = (char *)ctx->biosdir - ctx->rom; ctx->current_table = BUFF_TO_RUN_MODE(*ctx, ctx->biosdir, AMD_ADDR_REL_BIOS);
count = ctx->biosdir->header.num_entries; count = ctx->biosdir->header.num_entries;
assert_fw_entry(count, MAX_BIOS_ENTRIES, ctx); assert_fw_entry(count, MAX_BIOS_ENTRIES, ctx);
ctx->biosdir->entries[count].type = AMD_BIOS_L2_PTR; ctx->biosdir->entries[count].type = AMD_BIOS_L2_PTR;
@ -1287,7 +1287,7 @@ static void integrate_bios_firmwares(context *ctx,
level = BDT_BOTH; level = BDT_BOTH;
current_table_save = ctx->current_table; current_table_save = ctx->current_table;
ctx->current_table = (char *)biosdir - ctx->rom; ctx->current_table = BUFF_TO_RUN_MODE(*ctx, biosdir, AMD_ADDR_REL_BIOS);
adjust_current_pointer(ctx, 0, TABLE_ALIGNMENT); adjust_current_pointer(ctx, 0, TABLE_ALIGNMENT);
for (i = 0, count = 0; fw_table[i].type != AMD_BIOS_INVALID; i++) { for (i = 0, count = 0; fw_table[i].type != AMD_BIOS_INVALID; i++) {