util/amdfwtool: rename PSP related embedded_firmware struct elements

The element at offset 0x14 in the embedded_firmware struct is the
pointer to the combo PSP directory header, so rename it from comboable
to combo_psp_directory to clarify that this is not a flag, but a pointer
to a data structure. Also rename psp_entry to psp_directory since it
points to the PSP directory table.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: Ic6149c17ae813f4dcea71c308054849a1a2e4394
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58419
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Kangheui Won <khwon@chromium.org>
This commit is contained in:
Felix Held 2021-10-18 14:00:35 +02:00 committed by Felix Held
parent 35360a9e66
commit ad68b07d45
2 changed files with 5 additions and 5 deletions

View File

@ -1587,13 +1587,13 @@ int main(int argc, char **argv)
} }
if (comboable) if (comboable)
amd_romsig->comboable = BUFF_TO_RUN(ctx, pspdir); amd_romsig->combo_psp_directory = BUFF_TO_RUN(ctx, pspdir);
else else
amd_romsig->psp_entry = BUFF_TO_RUN(ctx, pspdir); amd_romsig->psp_directory = BUFF_TO_RUN(ctx, pspdir);
#if PSP_COMBO #if PSP_COMBO
psp_combo_directory *combo_dir = new_combo_dir(&ctx); psp_combo_directory *combo_dir = new_combo_dir(&ctx);
amd_romsig->comboable = BUFF_TO_RUN(ctx, combo_dir); amd_romsig->combo_psp_directory = BUFF_TO_RUN(ctx, combo_dir);
/* 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;
/* TODO: PSP ID. Documentation is needed. */ /* TODO: PSP ID. Documentation is needed. */

View File

@ -86,8 +86,8 @@ typedef struct _embedded_firmware {
uint32_t imc_entry; uint32_t imc_entry;
uint32_t gec_entry; uint32_t gec_entry;
uint32_t xhci_entry; uint32_t xhci_entry;
uint32_t psp_entry; uint32_t psp_directory;
uint32_t comboable; uint32_t combo_psp_directory;
uint32_t bios0_entry; /* todo: add way to select correct entry */ uint32_t bios0_entry; /* todo: add way to select correct entry */
uint32_t bios1_entry; uint32_t bios1_entry;
uint32_t bios2_entry; uint32_t bios2_entry;