From c5c7fa494b881eb837248e35ffc888a5978c556b Mon Sep 17 00:00:00 2001 From: Felix Held Date: Mon, 20 Mar 2023 16:02:47 +0100 Subject: util/amdfwtool: remove unused union from embedded_firmware struct Since commit 2f6b7d557d97 ("amdfwtool: Move the filling of table headers into functions"), the combo_psp_directory union element in the embedded_firmware is unused and the new_psp_directory element is used in all places, so replace the union of new_psp_directory and combo_psp_directory with just the new_psp_directory struct element. Signed-off-by: Felix Held Change-Id: I35d339b3084ec8f93210095c233f5e68296d0013 Reviewed-on: https://review.coreboot.org/c/coreboot/+/73834 Tested-by: build bot (Jenkins) Reviewed-by: Fred Reitberger --- util/amdfwtool/amdfwtool.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'util') diff --git a/util/amdfwtool/amdfwtool.h b/util/amdfwtool/amdfwtool.h index 23dc0ac5a6..5d6047c0c5 100644 --- a/util/amdfwtool/amdfwtool.h +++ b/util/amdfwtool/amdfwtool.h @@ -148,10 +148,7 @@ typedef struct _embedded_firmware { uint32_t gec_entry; uint32_t xhci_entry; uint32_t psp_directory; - union { - uint32_t new_psp_directory; - uint32_t combo_psp_directory; - }; + uint32_t new_psp_directory; /* also used as 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