GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

amdfwtool: Fill the address in EFS header as "relative to BIOS" 

If ctx.address_mode is "physical", it will keep as "physical".
If ctx.address_mode is "relative to table", it will be changed as
"relative to BIOS".

Because the "current table" is the whole flash, the code worked well.

TEST=Binary identical test on amd/birman amd/chausie amd/majolica
amd/gardenia pcengines/apu2 amd/mandolin

Change-Id: I9acb54cc5de149d8a705bb05bf351c44b7d3ced1
Signed-off-by: Zheng Bao <fishbaozi@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/73120
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
This commit is contained in:
Zheng Bao 2023-02-19 13:14:53 +08:00 committed by Fred Reitberger
parent 222903e57a
commit da43c41f98
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
util/amdfwtool/amdfwtool.c
View File

@ -2577,7 +2577,8 @@ int main(int argc, char **argv)
switch (cb_config.soc_id) { switch (cb_config.soc_id) {
case PLATFORM_UNKNOWN: case PLATFORM_UNKNOWN:
amd_romsig->psp_directory = BUFF_TO_RUN(ctx, pspdir); amd_romsig->psp_directory =
BUFF_TO_RUN_MODE(ctx, pspdir, AMD_ADDR_REL_BIOS);
break; break;
case PLATFORM_CEZANNE: case PLATFORM_CEZANNE:
case PLATFORM_MENDOCINO: case PLATFORM_MENDOCINO:
@ -2590,17 +2591,20 @@ int main(int argc, char **argv)
case PLATFORM_LUCIENNE: case PLATFORM_LUCIENNE:
case PLATFORM_RENOIR: case PLATFORM_RENOIR:
default: default:
amd_romsig->new_psp_directory = BUFF_TO_RUN(ctx, pspdir); amd_romsig->new_psp_directory =
BUFF_TO_RUN_MODE(ctx, pspdir, AMD_ADDR_REL_BIOS);
break; break;
} }
if (cb_config.use_combo) { if (cb_config.use_combo) {
psp_combo_directory *combo_dir = new_combo_dir(&ctx); psp_combo_directory *combo_dir = new_combo_dir(&ctx);
amd_romsig->combo_psp_directory = BUFF_TO_RUN(ctx, combo_dir); amd_romsig->combo_psp_directory =
BUFF_TO_RUN_MODE(ctx, combo_dir, AMD_ADDR_REL_BIOS);
/* 0 -Compare PSP ID, 1 -Compare chip family ID */ /* 0 -Compare PSP ID, 1 -Compare chip family ID */
combo_dir->entries[0].id_sel = 0; combo_dir->entries[0].id_sel = 0;
combo_dir->entries[0].id = get_psp_id(cb_config.soc_id); combo_dir->entries[0].id = get_psp_id(cb_config.soc_id);
combo_dir->entries[0].lvl2_addr = BUFF_TO_RUN(ctx, pspdir); combo_dir->entries[0].lvl2_addr =
BUFF_TO_RUN_MODE(ctx, pspdir, AMD_ADDR_REL_BIOS);
combo_dir->header.lookup = 1; combo_dir->header.lookup = 1;
fill_dir_header(combo_dir, 1, PSP2_COOKIE, &ctx); fill_dir_header(combo_dir, 1, PSP2_COOKIE, &ctx);
@ -2644,7 +2648,8 @@ int main(int argc, char **argv)
case PLATFORM_LUCIENNE: case PLATFORM_LUCIENNE:
case PLATFORM_CEZANNE: case PLATFORM_CEZANNE:
if (!cb_config.recovery_ab) if (!cb_config.recovery_ab)
amd_romsig->bios3_entry = BUFF_TO_RUN(ctx, biosdir); amd_romsig->bios3_entry =
BUFF_TO_RUN_MODE(ctx, biosdir, AMD_ADDR_REL_BIOS);
break; break;
case PLATFORM_MENDOCINO: case PLATFORM_MENDOCINO:
case PLATFORM_PHOENIX: case PLATFORM_PHOENIX:
@ -2655,7 +2660,8 @@ int main(int argc, char **argv)
case PLATFORM_RAVEN: case PLATFORM_RAVEN:
case PLATFORM_PICASSO: case PLATFORM_PICASSO:
default: default:
amd_romsig->bios1_entry = BUFF_TO_RUN(ctx, biosdir); amd_romsig->bios1_entry =
BUFF_TO_RUN_MODE(ctx, biosdir, AMD_ADDR_REL_BIOS);
break; break;
} }
} }