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

util/amdfwtool/data_parse: fix SPL table handling regression 

Use the SPL table binary from the config file if no override is
specified via the spl-table command line argument. This fixes a
regression caused by commit 6c5ec8e31c
(amdfwtool: Add options to support mainboard specific SPL table).

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I93419a878b41b1dfcbf58d930740aaae553120f6
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63314
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
This commit is contained in:
Felix Held 2022-04-02 03:49:07 +02:00
parent ac68384c0c
commit 11b0d360ba
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/amdfwtool/data_parse.c
View File

@ -295,10 +295,10 @@ static uint8_t find_register_fw_filename_psp_dir(char *fw_name, char *filename,
subprog = 0; subprog = 0;
} else if (strcmp(fw_name, "SPL_TABLE_FILE") == 0) { } else if (strcmp(fw_name, "SPL_TABLE_FILE") == 0) {
if (cb_config->have_mb_spl) { if (cb_config->have_mb_spl) {
fw_type = AMD_FW_SKIP;
} else {
fw_type = AMD_FW_SPL; fw_type = AMD_FW_SPL;
subprog = 0; subprog = 0;
} else {
fw_type = AMD_FW_SKIP;
} }
} else if (strcmp(fw_name, "DMCUERAMDCN21_FILE") == 0) { } else if (strcmp(fw_name, "DMCUERAMDCN21_FILE") == 0) {
fw_type = AMD_FW_DMCU_ERAM; fw_type = AMD_FW_DMCU_ERAM;