Change in coreboot[master]: util/amdfwtool/data_parse: fix SPL table handling regression

[Felix Held (Code Review)]

Felix Held has submitted this change. ( 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. This fixes a
regression caused by commit 6c5ec8e31ccbe3d9bbf201c956fc3b54703a9767
(amdfwtool: Add options to support mainboard specific SPL table).

Signed-off-by: Felix Held 
Change-Id: I93419a878b41b1dfcbf58d930740aaae553120f6
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63314
Tested-by: build bot (Jenkins) 
Reviewed-by: Raul Rangel 
---
M util/amdfwtool/data_parse.c
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Raul Rangel: Looks good to me, approved

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;

1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.