GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

amdfwtool: combo: Add combo feature for BIOS table 

It is similar to PSP combo.

Change-Id: If0523a4a0e1f31969e4bbaa6062dcc0f2d6da420
Signed-off-by: Zheng Bao <fishbaozi@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/66856
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
This commit is contained in:
Zheng Bao 2022-08-18 15:54:47 +08:00 committed by Fred Reitberger
parent 35cdffd6ea
commit 84fb9eac96
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
util/amdfwtool/amdfwtool.c
View File

@ -633,6 +633,7 @@ static void fill_dir_header(void *directory, uint32_t count, uint32_t cookie, co
switch (cookie) { switch (cookie) {
case PSP2_COOKIE: case PSP2_COOKIE:
case BHD2_COOKIE:
cdir->header.cookie = cookie; cdir->header.cookie = cookie;
/* lookup mode is hardcoded for now. */ /* lookup mode is hardcoded for now. */
cdir->header.lookup = 1; cdir->header.lookup = 1;
@ -2159,7 +2160,7 @@ int main(int argc, char **argv)
psp_directory_table *pspdir = NULL; psp_directory_table *pspdir = NULL;
psp_directory_table *pspdir2 = NULL; psp_directory_table *pspdir2 = NULL;
psp_directory_table *pspdir2_b = NULL; psp_directory_table *pspdir2_b = NULL;
psp_combo_directory *psp_combo_dir = NULL; psp_combo_directory *psp_combo_dir = NULL, *bhd_combo_dir = NULL;
int fuse_defined = 0; int fuse_defined = 0;
int targetfd; int targetfd;
char *output = NULL, *config = NULL; char *output = NULL, *config = NULL;
@ -2590,6 +2591,10 @@ int main(int argc, char **argv)
if (cb_config.use_combo) { if (cb_config.use_combo) {
psp_combo_dir = new_combo_dir(&ctx); psp_combo_dir = new_combo_dir(&ctx);
adjust_current_pointer(&ctx, 0, 0x1000U);
bhd_combo_dir = new_combo_dir(&ctx);
} }
if (cb_config.multi_level) { if (cb_config.multi_level) {
@ -2667,7 +2672,17 @@ int main(int argc, char **argv)
integrate_bios_firmwares(&ctx, biosdir, NULL, integrate_bios_firmwares(&ctx, biosdir, NULL,
amd_bios_table, BHD_COOKIE, &cb_config); amd_bios_table, BHD_COOKIE, &cb_config);
} }
fill_bios_directory_to_efs(amd_romsig, biosdir, &ctx, &cb_config); if (!cb_config.use_combo) {
fill_bios_directory_to_efs(amd_romsig, biosdir, &ctx, &cb_config);
} else {
fill_bios_directory_to_efs(amd_romsig, bhd_combo_dir, &ctx, &cb_config);
bhd_combo_dir->entries[0].id_sel = 0;
bhd_combo_dir->entries[0].id = get_psp_id(cb_config.soc_id);
bhd_combo_dir->entries[0].lvl2_addr =
BUFF_TO_RUN_MODE(ctx, biosdir, AMD_ADDR_REL_BIOS);
fill_dir_header(bhd_combo_dir, 1, BHD2_COOKIE, &ctx);
}
} }
targetfd = open(output, O_RDWR | O_CREAT | O_TRUNC, 0666); targetfd = open(output, O_RDWR | O_CREAT | O_TRUNC, 0666);

1
util/amdfwtool/amdfwtool.h
View File

@ -317,6 +317,7 @@ typedef struct _ish_directory_table {
#define PSP2_COOKIE 0x50535032 /* 'PSP2' */ #define PSP2_COOKIE 0x50535032 /* 'PSP2' */
#define BHD_COOKIE 0x44484224 /* 'DHB$ */ #define BHD_COOKIE 0x44484224 /* 'DHB$ */
#define BHDL2_COOKIE 0x324c4224 /* '2LB$ */ #define BHDL2_COOKIE 0x324c4224 /* '2LB$ */
#define BHD2_COOKIE 0x44484232 /* 'DHB2' */
#define PSP_LVL1 (1 << 0) #define PSP_LVL1 (1 << 0)
#define PSP_LVL2 (1 << 1) #define PSP_LVL2 (1 << 1)