Change in coreboot[master]: amdfwtool: Set soc name for Stoneyridge

[Werner Zeh (Code Review)]

Werner Zeh has submitted this change. ( https://review.coreboot.org/c/coreboot/+/58555 )

Change subject: amdfwtool: Set soc name for Stoneyridge
......................................................................

amdfwtool: Set soc name for Stoneyridge

For the stoneyridge, soc_name is not set in Makefile, so set_efs_table
is not called. Keep it unchanged.

Change-Id: I0e82188ce64733420a578446e22a077ef789be92
Signed-off-by: Zheng Bao 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58555
Tested-by: build bot (Jenkins) 
Reviewed-by: Felix Held 
---
M src/soc/amd/stoneyridge/Makefile.inc
M util/amdfwtool/amdfwtool.c
2 files changed, 9 insertions(+), 5 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Felix Held: Looks good to me, approved

diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc
index fd3ebf7..d265651 100644
--- a/src/soc/amd/stoneyridge/Makefile.inc
+++ b/src/soc/amd/stoneyridge/Makefile.inc
@@ -123,6 +123,7 @@

ifeq ($(FIRMWARE_TYPE),ST)
 OPT_COMBOCAPABLE=--combo-capable
+OPT_SOCNAME=--soc-name "Stoneyridge"
 endif

ifeq ($(CONFIG_USE_PSPSECUREOS),y)
@@ -147,6 +148,7 @@
    	$(OPT_COMBOCAPABLE)\
    	$(OPT_PSP_USE_PSPSECUREOS) \
    	--config $(CONFIG_AMDFW_CONFIG_FILE) \
+		$(OPT_SOCNAME) \
    	--flashsize $(CONFIG_ROM_SIZE) \
    	--location $(shell printf "0x%x" $(STONEYRIDGE_FWM_POSITION)) \
    	--output	$@
diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index b10315e..ee360f0 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -1586,11 +1586,13 @@
    amd_romsig->xhci_entry = 0;

if (soc_id != PLATFORM_UNKNOWN) {
-		retval = set_efs_table(soc_id, amd_romsig, efs_spi_readmode,
-					efs_spi_speed, efs_spi_micron_flag);
-		if (retval) {
-			fprintf(stderr, "ERROR: Failed to initialize EFS table!\n");
-			return retval;
+		if (soc_id != PLATFORM_STONEYRIDGE) {
+			retval = set_efs_table(soc_id, amd_romsig, efs_spi_readmode,
+						efs_spi_speed, efs_spi_micron_flag);
+			if (retval) {
+				fprintf(stderr, "ERROR: Failed to initialize EFS table!\n");
+				return retval;
+			}
    	}
    } else {
    	fprintf(stderr, "WARNING: No SOC name specified.\n");