Change in coreboot[master]: amdfwtool: Add a union for combo and psp directory

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/58557 )

Change subject: amdfwtool: Add a union for combo and psp directory
......................................................................

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 
---
M util/amdfwtool/amdfwtool.c
M util/amdfwtool/amdfwtool.h
2 files changed, 5 insertions(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Felix Held: Looks good to me, approved

diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index ee360f0..38f0e62 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -1618,7 +1618,7 @@
    }

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 a7ac7c1..3136bf6 100644
--- a/util/amdfwtool/amdfwtool.h
+++ b/util/amdfwtool/amdfwtool.h
@@ -88,7 +88,10 @@
    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;