Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/63314 )
Change subject: util/amdfwtool/data_parse: fix SPL table handling regression ......................................................................
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.
Signed-off-by: Felix Held felix-coreboot@felixheld.de Change-Id: I93419a878b41b1dfcbf58d930740aaae553120f6 --- M util/amdfwtool/data_parse.c 1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/14/63314/1
diff --git a/util/amdfwtool/data_parse.c b/util/amdfwtool/data_parse.c index 09b975d..a080eec 100644 --- a/util/amdfwtool/data_parse.c +++ b/util/amdfwtool/data_parse.c @@ -295,10 +295,10 @@ subprog = 0; } else if (strcmp(fw_name, "SPL_TABLE_FILE") == 0) { if (cb_config->have_mb_spl) { + fw_type = AMD_FW_SKIP; + } else { fw_type = AMD_FW_SPL; subprog = 0; - } else { - fw_type = AMD_FW_SKIP; } } else if (strcmp(fw_name, "DMCUERAMDCN21_FILE") == 0) { fw_type = AMD_FW_DMCU_ERAM;