diff options
| author | Felix Held <felix.held@amd.corp-partner.google.com> | 2021-10-18 14:00:35 +0200 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2021-10-19 12:35:08 +0000 |
| commit | ad68b07d45fdc2489ec008d77466d116352db1b2 (patch) | |
| tree | 53bcf01229584b0cf91b8ad361bb8740b484d59a | |
| parent | 35360a9e66156042f2d9e4a8aec0ab2b9672ba89 (diff) | |
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>
| -rw-r--r-- | util/amdfwtool/amdfwtool.c | 6 | ||||
| -rw-r--r-- | util/amdfwtool/amdfwtool.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index d051582498..9ad913e6f1 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -1587,13 +1587,13 @@ int main(int argc, char **argv) } if (comboable) - amd_romsig->comboable = BUFF_TO_RUN(ctx, pspdir); + amd_romsig->combo_psp_directory = BUFF_TO_RUN(ctx, pspdir); else - amd_romsig->psp_entry = BUFF_TO_RUN(ctx, pspdir); + amd_romsig->psp_directory = BUFF_TO_RUN(ctx, pspdir); #if PSP_COMBO 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 */ combo_dir->entries[0].id_sel = 0; /* TODO: PSP ID. Documentation is needed. */ diff --git a/util/amdfwtool/amdfwtool.h b/util/amdfwtool/amdfwtool.h index d246af7932..d7f0f5db96 100644 --- a/util/amdfwtool/amdfwtool.h +++ b/util/amdfwtool/amdfwtool.h @@ -86,8 +86,8 @@ typedef struct _embedded_firmware { uint32_t imc_entry; uint32_t gec_entry; uint32_t xhci_entry; - uint32_t psp_entry; - uint32_t comboable; + uint32_t psp_directory; + uint32_t combo_psp_directory; uint32_t bios0_entry; /* todo: add way to select correct entry */ uint32_t bios1_entry; uint32_t bios2_entry; |