From b749d3f0d2ae97125375e3cb59356652c7fe2e03 Mon Sep 17 00:00:00 2001 From: Zheng Bao Date: Sat, 23 Oct 2021 20:20:21 +0800 Subject: amdfwtool: Add a union for combo and psp directory For combo layout, this is for combo header. For non-combo layout, this is for PSP directory. Change-Id: Ie7b5aec6b511ad61972908d1d22a13aeb7dd73a9 Signed-off-by: Zheng Bao Reviewed-on: https://review.coreboot.org/c/coreboot/+/58557 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held --- util/amdfwtool/amdfwtool.c | 2 +- util/amdfwtool/amdfwtool.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'util/amdfwtool') diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index ee360f0df4..38f0e621a7 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -1618,7 +1618,7 @@ int main(int argc, char **argv) } if (comboable) - amd_romsig->combo_psp_directory = BUFF_TO_RUN(ctx, pspdir); + amd_romsig->new_psp_directory = BUFF_TO_RUN(ctx, pspdir); else amd_romsig->psp_directory = BUFF_TO_RUN(ctx, pspdir); diff --git a/util/amdfwtool/amdfwtool.h b/util/amdfwtool/amdfwtool.h index a7ac7c1e3c..3136bf6034 100644 --- a/util/amdfwtool/amdfwtool.h +++ b/util/amdfwtool/amdfwtool.h @@ -88,7 +88,10 @@ typedef struct _embedded_firmware { uint32_t gec_entry; uint32_t xhci_entry; uint32_t psp_directory; - uint32_t combo_psp_directory; + union { + uint32_t new_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; -- cgit v1.2.3