sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

amdfwtool: Add a union for combo and psp directory

Browse Source 
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 <fishbaozi@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58557
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Zheng Bao
2021-10-23 20:20:21 +08:00
committed by Felix Held
parent b846b42a36
commit b749d3f0d2
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
util/amdfwtool/amdfwtool.c
View File

@@ -1618,7 +1618,7 @@ int main(int argc, char **argv)
} }
if (comboable) if (comboable)
amd_romsig->combo_psp_directory = BUFF_TO_RUN(ctx, pspdir); amd_romsig->new_psp_directory = BUFF_TO_RUN(ctx, pspdir);
else else
amd_romsig->psp_directory = BUFF_TO_RUN(ctx, pspdir); amd_romsig->psp_directory = BUFF_TO_RUN(ctx, pspdir);

5
util/amdfwtool/amdfwtool.h
View File

@@ -88,7 +88,10 @@ typedef struct _embedded_firmware {
uint32_t gec_entry; uint32_t gec_entry;
uint32_t xhci_entry; uint32_t xhci_entry;
uint32_t psp_directory; 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 bios0_entry; /* todo: add way to select correct entry */
uint32_t bios1_entry; uint32_t bios1_entry;
uint32_t bios2_entry; uint32_t bios2_entry;