diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc
index fd3ebf7a66..d265651061 100644
--- a/src/soc/amd/stoneyridge/Makefile.inc
+++ b/src/soc/amd/stoneyridge/Makefile.inc
@@ -123,6 +123,7 @@ endif
 
 ifeq ($(FIRMWARE_TYPE),ST)
 OPT_COMBOCAPABLE=--combo-capable
+OPT_SOCNAME=--soc-name "Stoneyridge"
 endif
 
 ifeq ($(CONFIG_USE_PSPSECUREOS),y)
@@ -147,6 +148,7 @@ $(obj)/amdfw.rom:	$(call strip_quotes, $(CONFIG_STONEYRIDGE_XHCI_FWM_FILE)) \
 		$(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 b10315ebf8..ee360f0df4 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -1586,11 +1586,13 @@ int main(int argc, char **argv)
 	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");