summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2023-03-20 16:02:47 +0100
committerFelix Held <felix-coreboot@felixheld.de>2023-03-21 18:02:47 +0000
commitc5c7fa494b881eb837248e35ffc888a5978c556b (patch)
tree6e99252db892c2192459b0cc71e28e19e1570639
parent0f0b6199537a9976efd34fab0f4636c89089cb59 (diff)
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 <felix-coreboot@felixheld.de> Change-Id: I35d339b3084ec8f93210095c233f5e68296d0013 Reviewed-on: https://review.coreboot.org/c/coreboot/+/73834 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
-rw-r--r--util/amdfwtool/amdfwtool.h5
1 files changed, 1 insertions, 4 deletions
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;